[BACK]Return to aitcfg.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libaitcfg / inc

Diff for /libaitcfg/inc/aitcfg.h between versions 1.16.10.1 and 1.22.2.1

version 1.16.10.1, 2019/12/05 14:32:36 version 1.22.2.1, 2026/08/04 18:51:43
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 - 2019Copyright 2004 - 2026
         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 55  struct tagCfg { Line 55  struct tagCfg {
         ait_val_t               cfg_sec;          ait_val_t               cfg_sec;
         ait_val_t               cfg_attr;          ait_val_t               cfg_attr;
         ait_val_t               cfg_val;          ait_val_t               cfg_val;
           int                     cfg_quoted;
   
         TAILQ_ENTRY(tagCfg)     cfg_next;          TAILQ_ENTRY(tagCfg)     cfg_next;
         RB_ENTRY(tagCfg)        cfg_node;          RB_ENTRY(tagCfg)        cfg_node;
Line 73  typedef struct tagRC { Line 74  typedef struct tagRC {
 #define CFG_ATTRIBUTE(x)        (assert((x)), AIT_GET_LIKE(&((struct tagCfg*) (x))->cfg_attr, const char*))  #define CFG_ATTRIBUTE(x)        (assert((x)), AIT_GET_LIKE(&((struct tagCfg*) (x))->cfg_attr, const char*))
 #define CFG_VALUE(x)            (assert((x)), AIT_GET_LIKE(&((struct tagCfg*) (x))->cfg_val, const char*))  #define CFG_VALUE(x)            (assert((x)), AIT_GET_LIKE(&((struct tagCfg*) (x))->cfg_val, const char*))
   
   #ifdef __cplusplus
   extern "C" {
   #endif
   
 // cfg_GetErrno() Get error code of last operation  // cfg_GetErrno() Get error code of last operation
 int cfg_GetErrno();  int cfg_GetErrno();
Line 100  cfg_root_t *cfgInitConfig(); Line 104  cfg_root_t *cfgInitConfig();
  */   */
 void cfgEndConfig(cfg_root_t **pcfg);  void cfgEndConfig(cfg_root_t **pcfg);
 /*  /*
    * cfgInitConfigExt() - Init existed config root
    *
    * @cfg = Config root
    * return: -1 error or 0 inited config root
    */
   int cfgInitConfigExt(cfg_root_t * __restrict cfg);
   /*
    * cfgLoadConfigExt() - Load config from file with recursion level of includes
    *
    * @cfgName = Config filename
    * @cfg = Config root
    * @lvl = Level of include recursion
    * return: -1 error or 0 ok
    */
   int cfgLoadConfigExt(const char *cfgName, cfg_root_t * __restrict cfg, int lvl);
   /*
  * cfgLoadConfig() - Load config from file   * cfgLoadConfig() - Load config from file
  *   *
  * @cfgName = Config filename   * @cfgName = Config filename
Line 156  int cfgReadLines(FILE *f, const char *delim, const cha Line 176  int cfgReadLines(FILE *f, const char *delim, const cha
 ait_val_t *cfgWriteLines(FILE *f, const char *delim, const char *eol,   ait_val_t *cfgWriteLines(FILE *f, const char *delim, const char *eol, 
                 const char *section, cfg_root_t * __restrict cfg);                  const char *section, cfg_root_t * __restrict cfg);
 /*  /*
 * cfgReadConfig() - Read file and add new item at config root * cfg_ReadConfig() - Read file and add new item at config root
  *   *
  * @f = File resource   * @f = File resource
  * @cfg = Config root   * @cfg = Config root
    * @lvl = Level of include recursion
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
  */   */
int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg);int cfg_ReadConfig(FILE *f, cfg_root_t * __restrict cfg, int lvl);
 #define cfgReadConfig(f, c)     cfg_ReadConfig((f), (c), 1)
 /*  /*
  * cfgWriteConfig() - Write config from memory   * cfgWriteConfig() - Write config from memory
  *   *
Line 173  int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg Line 195  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);
 /*  /*
    * cfgWriteConfigRaw() - Write config from memory by list
    *
    * @f = File handle
    * @cfg = Config root
    * @whitespace = Additional whitespace characters to file
    * return: -1 error or 0 ok
    */
   int cfgWriteConfigRaw(FILE *f, cfg_root_t * __restrict cfg, int whitespace);
   /*
  * cfgConcatConfig() - Concat two configs into one   * cfgConcatConfig() - Concat two configs into one
  *   *
  * @cfg = Config root   * @cfg = Config root
Line 197  int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_ro Line 228  int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_ro
  */   */
 void cfg_dumpCfg(cfg_root_t * __restrict cfg);  void cfg_dumpCfg(cfg_root_t * __restrict cfg);
 /*  /*
    * cfg_delSection() - Delete entire section
    *
    * @cfg = Config root
    * @csSec = Config section //[{csSec}]
    * return: -1 error, 0 nothing deleted or >0 deleted attributes
    */
   int cfg_delSection(cfg_root_t * __restrict cfg, const char *csSec);
   /*
  * cfg_getSection() - Get entire section attributes into array   * cfg_getSection() - Get entire section attributes into array
  *   *
  * @cfg = Config root   * @cfg = Config root
Line 209  array_t *cfg_getSection(cfg_root_t * __restrict cfg, c Line 248  array_t *cfg_getSection(cfg_root_t * __restrict cfg, c
  *   *
  * @cfg = Config root   * @cfg = Config root
  * @csSec = Config section //[{csSec}]   * @csSec = Config section //[{csSec}]
 * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * @csAttr = Config attribute //{csAttr} = ...
  * return: 0 not found item, -1 error or >0 position in list   * return: 0 not found item, -1 error or >0 position in list
  */   */
 int cfg_findAttribute(cfg_root_t * __restrict cfg,   int cfg_findAttribute(cfg_root_t * __restrict cfg, 
Line 219  int cfg_findAttribute(cfg_root_t * __restrict cfg,  Line 258  int cfg_findAttribute(cfg_root_t * __restrict cfg, 
  *   *
  * @cfg = Config root   * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section   * @csSec = Config section //[{csSec}], if NULL unset in *default* section
 * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * @csAttr = Config attribute //{csAttr} = ...
  * return: NULL item not found or null parameters, !=NULL value const string   * return: NULL item not found or null parameters, !=NULL value const string
  */   */
 const char *cfg_getAttribute(cfg_root_t * __restrict cfg,   const char *cfg_getAttribute(cfg_root_t * __restrict cfg, 
Line 229  const char *cfg_getAttribute(cfg_root_t * __restrict c Line 268  const char *cfg_getAttribute(cfg_root_t * __restrict c
  *   *
  * @cfg = Config root   * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section   * @csSec = Config section //[{csSec}], if NULL unset in *default* section
 * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * @csAttr = Config attribute //{csAttr} = ...
  * return: value   * return: value
  */   */
 long cfg_getAttributeLong(cfg_root_t * __restrict cfg,   long cfg_getAttributeLong(cfg_root_t * __restrict cfg, 
Line 239  long cfg_getAttributeLong(cfg_root_t * __restrict cfg, Line 278  long cfg_getAttributeLong(cfg_root_t * __restrict cfg,
  *   *
  * @cfg = Config root   * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section   * @csSec = Config section //[{csSec}], if NULL unset in *default* section
 * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * @csAttr = Config attribute //{csAttr} = ...
  * return: value   * return: value
  */   */
 long long  long long
Line 250  cfg_getAttributeLLong(cfg_root_t * __restrict cfg,  Line 289  cfg_getAttributeLLong(cfg_root_t * __restrict cfg, 
  *   *
  * @cfg = Config root   * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section   * @csSec = Config section //[{csSec}], if NULL unset in *default* section
 * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * @csAttr = Config attribute //{csAttr} = ...
  * return: value   * return: value
  */   */
 double cfg_getAttributeDouble(cfg_root_t * __restrict cfg,   double cfg_getAttributeDouble(cfg_root_t * __restrict cfg, 
Line 260  double cfg_getAttributeDouble(cfg_root_t * __restrict  Line 299  double cfg_getAttributeDouble(cfg_root_t * __restrict 
  *   *
  * @cfg = Config root   * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section   * @csSec = Config section //[{csSec}], if NULL unset in *default* section
 * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * @csAttr = Config attribute //{csAttr} = ...
  * return: value   * return: value
  */   */
 long double cfg_getAttributeLDouble(cfg_root_t * __restrict cfg,   long double cfg_getAttributeLDouble(cfg_root_t * __restrict cfg, 
Line 281  int cfg_setAttribute(cfg_root_t * __restrict cfg, cons Line 320  int cfg_setAttribute(cfg_root_t * __restrict cfg, cons
  *   *
  * @cfg = Config root   * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section   * @csSec = Config section //[{csSec}], if NULL unset in *default* section
 * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * @csAttr = Config attribute //{csAttr} = ...
  * return: 0 item not found, -1 error or 1 removed item   * return: 0 item not found, -1 error or 1 removed item
  */   */
 int cfg_unsetAttribute(cfg_root_t * __restrict cfg, const char *csSec,   int cfg_unsetAttribute(cfg_root_t * __restrict cfg, const char *csSec, 
Line 292  int cfg_unsetAttribute(cfg_root_t * __restrict cfg, co Line 331  int cfg_unsetAttribute(cfg_root_t * __restrict cfg, co
  *   *
  * @cfg = Config root   * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section   * @csSec = Config section //[{csSec}], if NULL unset in *default* section
 * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute * @csAttr = Config attribute //{csAttr} = ...
  * @val = Return buffer for item Value //... = {val}   * @val = Return buffer for item Value //... = {val}
  * @csDefValue = *Default Value* for return in //{val}, if not found item in config   * @csDefValue = *Default Value* for return in //{val}, if not found item in config
  * return: 0 item not found, -1 error or >0 number of copied bytes in //{val}   * return: 0 item not found, -1 error or >0 number of copied bytes in //{val}
Line 300  int cfg_unsetAttribute(cfg_root_t * __restrict cfg, co Line 339  int cfg_unsetAttribute(cfg_root_t * __restrict cfg, co
 int cfg_loadAttribute(cfg_root_t * __restrict cfg, const char *csSec,   int cfg_loadAttribute(cfg_root_t * __restrict cfg, const char *csSec, 
                 const char *csAttr, ait_val_t * __restrict val, const char *csDefValue);                  const char *csAttr, ait_val_t * __restrict val, const char *csDefValue);
   
   #ifdef __cplusplus
   }
   #endif
   
 #endif  #endif
Removed from v.1.16.10.1  
changed lines
  Added in v.1.22.2.1

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