--- libaitcfg/inc/aitcfg.h 2009/09/23 14:20:53 1.2.2.3 +++ libaitcfg/inc/aitcfg.h 2010/03/22 14:53:49 1.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcfg.h,v 1.2.2.3 2009/09/23 14:20:53 misho Exp $ +* $Id: aitcfg.h,v 1.4 2010/03/22 14:53:49 misho Exp $ * *************************************************************************/ #ifndef __AITCFG_H @@ -25,6 +25,14 @@ typedef struct tagHead sl_config; /* + * Macros for config library. Typecast string to specific config string format. +*/ +#define CFG(x) (unsigned char *)(x) + +#define CFG_ISSET(x) ((long) cfg_FirstItem((x))) + + +/* * InitConfig() Head initializing function for config * @cfg = New head element for init * return: 0 ok; -1 error:: new head element is null @@ -95,7 +103,15 @@ int cfg_WriteConfig(FILE *f, sl_config * __restrict cf */ int ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg); +/* + * MergeConfig() Marge two list in one cfg and destroy add_cfg + * @cfg = Head list element of main list + * @add_cfg = Head list element of merged list (destroy after all!) + * return: 0 ok; -1 error:: can`t merge lists +*/ +int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg); + /* * cfg_FindAttribute() Find attribute position in config list * @cfg = Head list element @@ -129,6 +145,13 @@ int cfg_UnsetAttribute(sl_config * __restrict cfg, con * return: NULL item not found or null parameters; !=NULL value const string */ inline const u_char *cfg_GetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr); + +/* + * cfg_FirstItem() Get first item from config list and return his value + * @cfg = Head list element + * return: NULL if no items in list; !=NULL first pair item +*/ +inline struct tagPair *cfg_FirstItem(sl_config * __restrict cfg); /* * cfg_LoadAttribute() Extended get attribute, if not found item return *default value*