--- libaitcfg/inc/aitcfg.h 2013/01/17 13:33:30 1.10.4.1 +++ libaitcfg/inc/aitcfg.h 2014/01/30 08:13:09 1.12.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcfg.h,v 1.10.4.1 2013/01/17 13:33:30 misho Exp $ +* $Id: aitcfg.h,v 1.12.2.1 2014/01/30 08:13:09 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 @@ -56,13 +56,14 @@ struct tagCfg { ait_val_t cfg_attr; ait_val_t cfg_val; - SLIST_ENTRY(tagCfg) cfg_next; + TAILQ_ENTRY(tagCfg) cfg_next; RB_ENTRY(tagCfg) cfg_node; }; typedef struct tagRC { pthread_mutex_t rc_mtx; - struct tagCfg *slh_first; + struct tagCfg *tqh_first; + struct tagCfg **tqh_last; struct tagCfg *rbh_root; } cfg_root_t; #define CFG_RC_LOCK(x) pthread_mutex_lock(&(x)->rc_mtx) @@ -70,9 +71,9 @@ typedef struct tagRC { // cfg_GetErrno() Get error code of last operation -inline int cfg_GetErrno(); +int cfg_GetErrno(); // cfg_GetError() Get error text of last operation -inline const char *cfg_GetError(); +const char *cfg_GetError(); /* @@ -186,7 +187,7 @@ int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_ro * @csAttr = Config attribute //{csAttr} = ... * return: 0 not found item, -1 error or >0 position in list */ -inline int cfg_findAttribute(cfg_root_t * __restrict cfg, +int cfg_findAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr); /* * cfg_getAttribute() - Get item from config and return value from it @@ -196,7 +197,7 @@ inline int cfg_findAttribute(cfg_root_t * __restrict c * @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 *cfg_getAttribute(cfg_root_t * __restrict cfg, +const char *cfg_getAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr); /* * cfg_setAttribute() - Set item in config or adding new item if not exists