[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.13 and 1.15

version 1.13, 2014/01/30 08:30:47 version 1.15, 2014/03/19 18:38:43
Line 69  typedef struct tagRC { Line 69  typedef struct tagRC {
 #define CFG_RC_LOCK(x)          pthread_mutex_lock(&(x)->rc_mtx)  #define CFG_RC_LOCK(x)          pthread_mutex_lock(&(x)->rc_mtx)
 #define CFG_RC_UNLOCK(x)        pthread_mutex_unlock(&(x)->rc_mtx)  #define CFG_RC_UNLOCK(x)        pthread_mutex_unlock(&(x)->rc_mtx)
   
   #define CFG_SECTION(x)          (assert((x)), AIT_GET_LIKE(&((struct tagCfg*) (x))->cfg_sec, 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*))
   
   
 // cfg_GetErrno() Get error code of last operation  // cfg_GetErrno() Get error code of last operation
 int cfg_GetErrno();  int cfg_GetErrno();
 // cfg_GetError() Get error text of last operation  // cfg_GetError() Get error text of last operation
Line 85  const char *cfg_GetError(); Line 89  const char *cfg_GetError();
 /*  /*
  * cfgInitConfig() - Init config root   * cfgInitConfig() - Init config root
  *   *
 * @cfg = Config root * return: NULL error or !=NULL allocated config root
 * return: -1 error or 0 ok 
  */   */
int cfgInitConfig(cfg_root_t * __restrict cfg);cfg_root_t *cfgInitConfig();
 /*  /*
    * cfgEndConfig() - Free resources & config root
    *
    * @pcfg = Config root
    * return: none
    */
   void cfgEndConfig(cfg_root_t **pcfg);
   /*
  * cfgLoadConfig() - Load config from file   * cfgLoadConfig() - Load config from file
  *   *
  * @cfgName = Config filename   * @cfgName = Config filename
Line 180  int cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_r Line 190  int cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_r
 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);
   
 /*  /*
    * cfg_getSection() - Get entire section attributes into array
    *
    * @cfg = Config root
    * @csSec = Config section //[{csSec}]
    * return: NULL not found or !=NULL allocated array, must free with array_Destroy() after use!
    */
   array_t *cfg_getSection(cfg_root_t * __restrict cfg, const char *csSec);
   /*
  * cfg_findAttribute() - Find attribute position in config file   * cfg_findAttribute() - Find attribute position in config file
  *   *
  * @cfg = Config root   * @cfg = Config root
  * @csSec = Config section //[{csSec}]   * @csSec = Config section //[{csSec}]
 * @csAttr = Config attribute //{csAttr} = ... * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
  * 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 194  int cfg_findAttribute(cfg_root_t * __restrict cfg,  Line 212  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 unset as *any* attribute * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
  * 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 215  int cfg_setAttribute(cfg_root_t * __restrict cfg, cons Line 233  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} = ... * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
  * 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 226  int cfg_unsetAttribute(cfg_root_t * __restrict cfg, co Line 244  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} = ... * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
  * @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}
Removed from v.1.13  
changed lines
  Added in v.1.15

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