--- libaitcfg/inc/aitcfg.h 2012/04/04 13:11:49 1.7 +++ libaitcfg/inc/aitcfg.h 2013/05/26 20:11:53 1.10.4.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcfg.h,v 1.7 2012/04/04 13:11:49 misho Exp $ +* $Id: aitcfg.h,v 1.10.4.3 2013/05/26 20:11:53 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 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,13 +97,20 @@ 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 @@ -116,6 +122,29 @@ int cfgCreateConfig(const char *csConfigName, cfg_root 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 @@ -157,7 +186,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 @@ -167,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