--- libaitcfg/src/queue.c 2013/01/17 13:42:10 1.11.4.1 +++ libaitcfg/src/queue.c 2014/01/30 08:13:10 1.13.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: queue.c,v 1.11.4.1 2013/01/17 13:42:10 misho Exp $ +* $Id: queue.c,v 1.13.2.1 2014/01/30 08:13:10 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 @@ -87,7 +87,7 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch * @csAttr = Config attribute //{csAttr} = ... * return: 0 not found item, -1 error or >0 position in list */ -inline int +int cfg_findAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { struct tagCfg *av, fav; @@ -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; @@ -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); } @@ -220,7 +220,7 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute * return: NULL item not found or null parameters, !=NULL value const string */ -inline const char * +const char * cfg_getAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { struct tagCfg *av;