--- libaitcfg/inc/aitcfg.h 2012/04/02 16:00:00 1.6.4.4 +++ libaitcfg/inc/aitcfg.h 2012/04/03 11:51:52 1.6.4.6 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcfg.h,v 1.6.4.4 2012/04/02 16:00:00 misho Exp $ +* $Id: aitcfg.h,v 1.6.4.6 2012/04/03 11:51:52 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -49,6 +49,7 @@ SUCH DAMAGE. #include #include +#include struct tagCfg { @@ -60,19 +61,13 @@ struct tagCfg { RB_ENTRY(tagCfg) cfg_node; }; typedef struct tagRC { -#ifdef HAVE_LIBPTHREAD pthread_mutex_t rc_mtx; -#endif + struct tagCfg *slh_first; struct tagCfg *rbh_root; } cfg_root_t; -#ifdef HAVE_LIBPTHREAD #define CFG_RC_LOCK(x) pthread_mutex_lock(&(x)->rc_mtx) #define CFG_RC_UNLOCK(x) pthread_mutex_unlock(&(x)->rc_mtx) -#else -#define CFG_RC_LOCK(x) -#define CFG_RC_UNLOCK(x) -#endif // cfg_GetErrno() Get error code of last operation @@ -83,11 +78,18 @@ inline const char *cfg_GetError(); /* * Macros for config library. -*/ + */ #define CFG_ISEMPTY(x) RB_EMPTY((x)) /* + * cfgInitConfig() - Init config root + * + * @cfg = Config root + * return: -1 error or 0 ok + */ +int cfgInitConfig(cfg_root_t * __restrict cfg); +/* * cfgLoadConfig() - Load config from file * * @cfgName = Config filename @@ -111,6 +113,15 @@ void cfgUnloadConfig(cfg_root_t * __restrict cfg); * return: -1 error or 0 ok */ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg); +/* + * cfgWriteConfig() - Write config from memory + * + * @f = File handle + * @cfg = Config root + * @whitespace = Additional whitespace characters to file + * return: -1 error or 0 ok + */ +int cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, int whitespace); #if 0 /* @@ -128,22 +139,6 @@ int cfg_CreateConfig(const char *csConfigName, sl_conf */ int CreateConfig(const char *csConfigName, sl_config * __restrict cfg); - -/* - * WriteConfig() Write to file from items in config list - * @f = file resource - * @cfg = Head list element - * return: 0 ok; -1 error:: can`t write to file -*/ -int WriteConfig(FILE *f, sl_config * __restrict cfg); - -/* - * cfg_WriteConfig() Write to file from items in config list without whitespaces! - * @f = file resource - * @cfg = Head list element - * return: 0 ok; -1 error:: can`t write to file -*/ -int cfg_WriteConfig(FILE *f, sl_config * __restrict cfg); /* * ConcatConfig() Concat two list in one