--- libaitcfg/inc/aitcfg.h 2014/03/03 09:41:09 1.14 +++ libaitcfg/inc/aitcfg.h 2014/03/19 17:12:36 1.14.2.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcfg.h,v 1.14 2014/03/03 09:41:09 misho Exp $ +* $Id: aitcfg.h,v 1.14.2.4 2014/03/19 17:12:36 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -69,7 +69,11 @@ typedef struct tagRC { #define CFG_RC_LOCK(x) pthread_mutex_lock(&(x)->rc_mtx) #define CFG_RC_UNLOCK(x) pthread_mutex_unlock(&(x)->rc_mtx) +#define CFG_SECTION(x) (assert((x)), AIT_GET_STR(&((struct tagCfg*) (x))->cfg_sec)) +#define CFG_ATTRIBUTE(x) (assert((x)), AIT_GET_STR(&((struct tagCfg*) (x))->cfg_attr)) +#define CFG_VALUE(x) (assert((x)), AIT_GET_STR(&((struct tagCfg*) (x))->cfg_val)) + // cfg_GetErrno() Get error code of last operation int cfg_GetErrno(); // cfg_GetError() Get error text of last operation @@ -186,11 +190,19 @@ int cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_r int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg); /* + * cfg_getSection() - Get entire section attributes into array + * + * @cfg = Config root + * @csSec = Config section //[{csSec}] + * return: NULL not found or !=NULL allocated array, must free with array_Destroy() after use! + */ +array_t *cfg_getSection(cfg_root_t * __restrict cfg, const char *csSec); +/* * cfg_findAttribute() - Find attribute position in config file * * @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 cfg_findAttribute(cfg_root_t * __restrict cfg, @@ -200,7 +212,7 @@ int cfg_findAttribute(cfg_root_t * __restrict cfg, * * @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 *cfg_getAttribute(cfg_root_t * __restrict cfg, @@ -221,7 +233,7 @@ int cfg_setAttribute(cfg_root_t * __restrict cfg, cons * * @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 cfg_unsetAttribute(cfg_root_t * __restrict cfg, const char *csSec, @@ -232,7 +244,7 @@ int cfg_unsetAttribute(cfg_root_t * __restrict cfg, co * * @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}