--- libaitcfg/src/queue.c 2013/05/30 09:12:27 1.12 +++ libaitcfg/src/queue.c 2014/03/19 16:35:29 1.14.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: queue.c,v 1.12 2013/05/30 09:12:27 misho Exp $ +* $Id: queue.c,v 1.14.4.1 2014/03/19 16:35:29 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2014 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -84,7 +84,7 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch * * @cfg = Config root * @csSec = Config section //[{csSec}] - * @csAttr = Config attribute //{csAttr} = ... + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * return: 0 not found item, -1 error or >0 position in list */ int @@ -93,7 +93,7 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c struct tagCfg *av, fav; register int cx = 0; - if (!cfg || !csAttr) { + if (!cfg) { cfg_SetErr(EINVAL, "Invalid argument(s)"); return -1; } else @@ -106,7 +106,7 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, E_ALIGN(strlen(csAttr), 2) / 2); - SLIST_FOREACH(av, cfg, cfg_next) { + TAILQ_FOREACH(av, cfg, cfg_next) { ++cx; if (!cfg_tree_cmp(&fav, av)) return cx; @@ -120,7 +120,7 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c * * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ... + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * return: 0 item not found, -1 error or 1 removed item */ int @@ -128,7 +128,7 @@ cfg_unsetAttribute(cfg_root_t * __restrict cfg, const { struct tagCfg *av; - if (!cfg || !csAttr) + if (!cfg) return -1; av = _selectAttribute(cfg, csSec, csAttr); @@ -137,7 +137,7 @@ cfg_unsetAttribute(cfg_root_t * __restrict cfg, const CFG_RC_LOCK(cfg); RB_REMOVE(tagRC, cfg, av); - SLIST_REMOVE(cfg, av, tagCfg, cfg_next); + TAILQ_REMOVE(cfg, av, cfg_next); CFG_RC_UNLOCK(cfg); AIT_FREE_VAL(&av->cfg_val); @@ -178,9 +178,9 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch CFG_RC_LOCK(cfg); if (!section) - SLIST_INSERT_HEAD(cfg, av, cfg_next); + TAILQ_INSERT_TAIL(cfg, av, cfg_next); else - SLIST_INSERT_AFTER(section, av, cfg_next); + TAILQ_INSERT_BEFORE(section, av, cfg_next); CFG_RC_UNLOCK(cfg); } @@ -217,7 +217,7 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch * * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * return: NULL item not found or null parameters, !=NULL value const string */ const char * @@ -225,7 +225,7 @@ cfg_getAttribute(cfg_root_t * __restrict cfg, const ch { struct tagCfg *av; - if (!cfg || !csAttr) + if (!cfg) return NULL; av = _selectAttribute(cfg, csSec, csAttr); @@ -240,7 +240,7 @@ cfg_getAttribute(cfg_root_t * __restrict cfg, const ch * * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ... + * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * @val = Return buffer for item Value //... = {val} * @csDefValue = *Default Value* for return in //{val}, if not found item in config * return: 0 item not found, -1 error or >0 number of copied bytes in //{val} @@ -252,7 +252,7 @@ cfg_loadAttribute(cfg_root_t * __restrict cfg, const c struct tagCfg *av; int ret = 0; - if (!cfg || !csAttr || !val) { + if (!cfg || !val) { cfg_SetErr(EINVAL, "Invalid argument(s)"); return -1; }