Diff for /libaitcfg/inc/aitcfg.h between versions 1.6.4.7 and 1.10.4.1

version 1.6.4.7, 2012/04/03 12:54:49 version 1.10.4.1, 2013/01/17 13:33:30
Line 12  terms: Line 12  terms:
 All of the documentation and software included in the ELWIX and AITNET  All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>  Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
   
Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
         by Michael Pounov <misho@elwix.org>.  All rights reserved.          by Michael Pounov <misho@elwix.org>.  All rights reserved.
   
 Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
Line 47  SUCH DAMAGE. Line 47  SUCH DAMAGE.
 #define __AITCFG_H  #define __AITCFG_H
   
   
 #include <aitio.h>  
 #include <atree.h>  
 #include <pthread.h>  #include <pthread.h>
   #include <elwix.h>
   
   
 struct tagCfg {  struct tagCfg {
Line 98  int cfgInitConfig(cfg_root_t * __restrict cfg); Line 97  int cfgInitConfig(cfg_root_t * __restrict cfg);
  */   */
 int cfgLoadConfig(const char *cfgName, 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   * @cfg = Config root
  * return: none   * return: none
  */   */
 void cfgUnloadConfig(cfg_root_t * __restrict cfg);  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   * cfgReadConfig() - Read file and add new item at config root
  *   *
  * @f = File resource   * @f = File resource
Line 123  int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg Line 162  int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg
  */   */
 int cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, int whitespace);  int cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, int whitespace);
 /*  /*
    * 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);
   /*
  * cfgMergeConfig() - Marge two list in one cfg and destroy add_cfg   * cfgMergeConfig() - Marge two list in one cfg and destroy add_cfg
  *   *
  * @cfg = Config root of main list   * @cfg = Config root of main list
Line 130  int cfgWriteConfig(FILE *f, cfg_root_t * __restrict cf Line 177  int cfgWriteConfig(FILE *f, cfg_root_t * __restrict cf
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
  */   */
 int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg);  int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg);
   
 #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);  
 /*  
  * 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);  
   
   
 /*  
  * 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);  
 #endif  
   
 /*  /*
  * cfg_findAttribute() - Find attribute position in config file   * cfg_findAttribute() - Find attribute position in config file

Removed from v.1.6.4.7  
changed lines
  Added in v.1.10.4.1


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>