--- libaitcfg/inc/aitcfg.h 2012/04/03 11:51:52 1.6.4.6 +++ libaitcfg/inc/aitcfg.h 2014/01/29 23:46:35 1.11.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcfg.h,v 1.6.4.6 2012/04/03 11:51:52 misho Exp $ +* $Id: aitcfg.h,v 1.11.4.1 2014/01/29 23:46:35 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 +Copyright 2004 - 2014 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -47,9 +47,8 @@ SUCH DAMAGE. #define __AITCFG_H -#include -#include #include +#include struct tagCfg { @@ -71,9 +70,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(); /* @@ -98,14 +97,54 @@ int cfgInitConfig(cfg_root_t * __restrict cfg); */ int cfgLoadConfig(const char *cfgName, cfg_root_t * __restrict cfg); /* - * cfgUnloadConfig() - Unload config from memory and free resources + * cfgUnloadConfig() - Unload config from memory and destroy resources * * @cfg = Config root * return: none */ void cfgUnloadConfig(cfg_root_t * __restrict cfg); +/* + * cfgClearConfig() - Clear config and free resources + * + * @cfg = Config root + * return: none + */ +void cfgClearConfig(cfg_root_t * __restrict cfg); +/* + * cfgCreateConfig() - Create config file from memory + * + * @csConfigName = New config filename + * @cfg = Config root + * @whitespace = Additional whitespace characters to file + * return: -1 error or 0 ok + */ +int cfgCreateConfig(const char *csConfigName, cfg_root_t * __restrict cfg, + int whitespace); /* + * cfgReadLines() - Read custom lines and add new item at config root + * + * @f = File resource + * @delim = Custom delimiter, if =NULL default is '=' + * @end = Custom user end of file, if =NULL default is EOF + * @cfg = Config root + * return: -1 error or 0 ok + */ +int cfgReadLines(FILE *f, const char *delim, const char *end, + cfg_root_t * __restrict cfg); +/* + * cfgWriteLines() - Write custom lines and export data to variable + * + * @f = File resource + * @delim = Custom delimiter, if =NULL default is '=' + * @eol = End of line string, if =NULL default is "\n" + * @section = Export only section, if =NULL default is all + * @cfg = Config root + * return: =NULL error or !=NULL exported data, must be free after use with ait_freeVar() + */ +ait_val_t *cfgWriteLines(FILE *f, const char *delim, const char *eol, + const char *section, cfg_root_t * __restrict cfg); +/* * cfgReadConfig() - Read file and add new item at config root * * @f = File resource @@ -122,42 +161,24 @@ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg * return: -1 error or 0 ok */ int cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, int whitespace); - -#if 0 /* - * cfg_CreateConfig() Create config file from memory without whitespaces! - * @csConfigName = New config filename - * @cfg = Head list element - * return: 0 ok; -1 error:: can`t save new config -*/ -int cfg_CreateConfig(const char *csConfigName, sl_config * __restrict cfg); + * cfgConcatConfig() - Concat two configs into one + * + * @cfg = Config root + * @add_cfg = Concated config will be destroy after merge + * return: -1 error or 0 ok + */ +int cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg); /* - * CreateConfig() Create config file from memory - * @csConfigName = New config filename - * @cfg = Head list element - * return: 0 ok; -1 error:: can`t save new config -*/ -int CreateConfig(const char *csConfigName, sl_config * __restrict cfg); + * cfgMergeConfig() - Marge two list in one cfg and destroy add_cfg + * + * @cfg = Config root of main list + * @add_cfg = Merged config will be destroy after merge + * return: -1 error or 0 ok + */ +int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg); - /* - * ConcatConfig() Concat two list in one - * @cfg = Head list element of main list - * @add_cfg = Head list element of added list - * return: 0 ok; -1 error:: can`t concat lists -*/ -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); -#endif - -/* * cfg_findAttribute() - Find attribute position in config file * * @cfg = Config root @@ -165,7 +186,7 @@ int MergeConfig(sl_config * __restrict cfg, sl_config * @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 @@ -175,7 +196,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