--- libaitcfg/inc/aitcfg.h 2012/09/19 15:22:32 1.10 +++ libaitcfg/inc/aitcfg.h 2013/05/26 19:52:29 1.10.4.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcfg.h,v 1.10 2012/09/19 15:22:32 misho Exp $ +* $Id: aitcfg.h,v 1.10.4.2 2013/05/26 19:52:29 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 { @@ -141,7 +140,7 @@ int cfgReadLines(FILE *f, const char *delim, const cha * @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 io_freeVar() + * 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); @@ -187,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 @@ -197,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