[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.6 and 1.6.4.1

version 1.6, 2011/05/01 17:24:28 version 1.6.4.1, 2012/04/02 14:39:02
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, 2011Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
         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
   
   
struct tagPair {#include <aitio.h>
        unsigned int    uLine;#include <atree.h>
        unsigned char   *psSection; 
        unsigned char   *psAttribute; 
        unsigned char   *psValue; 
        struct tagPair *sle_next; 
}; 
   
struct tagHead {
        struct tagPair *slh_first;struct tagCfg {
         ait_val_t               cfg_sec;
         ait_val_t               cfg_attr;
         ait_val_t               cfg_val;
 
         SLIST_ENTRY(tagCfg)     cfg_next;
         RB_ENTRY(tagCfg)        cfg_node;
 };  };
typedef struct tagHead sl_config;typedef struct tagRC {
 #ifdef HAVE_LIBPTHREAD
         pthread_mutex_t         rc_mtx;
 #endif
         struct tagCfg           *slh_first;
         struct tagCfg           *rbh_root;
 } cfg_root_t;
 #ifdef HAVE_LIBPTHREAD
 #define CFG_RC_LOCK(x)          pthread_mutex_lock(&(x)->rc_mtx)
 #define CFG_RC_UNLOCK(x)        pthread_mutex_unlock(&(x)->rc_mtx)
 #else
 #define CFG_RC_LOCK(x)
 #define CFG_RC_UNLOCK(x)
 #endif
   
   
   // cfg_GetErrno() Get error code of last operation
   inline int cfg_GetErrno();
   // cfg_GetError() Get error text of last operation
   inline const char *cfg_GetError();
   
   
 /*  /*
 * Macros for config library. Typecast string to specific config string format. * Macros for config library.
 */  */
#define CFG(x)             (unsigned char *)(x)#define CFG_ISEMPTY(x)             RB_EMPTY((x))
   
 #define CFG_ISSET(x)    ((long) cfg_FirstItem((x)))  
   
   /*
    * cfgLoadConfig() - Load config from file
    *
    * @cfgName = Config filename
    * @cfg = Config root
    * return: -1 error or 0 ok
    */
   int cfgLoadConfig(const char *cfgName, cfg_root_t * __restrict cfg);
   /*
    * cfgUnloadConfig() - Unload config from memory and free resources
    *
    * @cfg = Config root
    * return: none
    */
   void cfgUnloadConfig(cfg_root_t * __restrict cfg);
   
 /*  /*
 * InitConfig() Head initializing function for config * cfgReadConfig() - Read file and add new item at config root
 * @cfg = New head element for init *
 * return: 0 ok; -1 error:: new head element is null * @f = File resource
*/ * @cfg = Config root
inline int InitConfig(sl_config * __restrict cfg); * return: -1 error or 0 ok
  */
 int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg);
 
 #if 0
 /*  /*
  * cfg_CreateConfig() Create config file from memory without whitespaces!   * cfg_CreateConfig() Create config file from memory without whitespaces!
  * @csConfigName = New config filename   * @csConfigName = New config filename
Line 89  int cfg_CreateConfig(const char *csConfigName, sl_conf Line 127  int cfg_CreateConfig(const char *csConfigName, sl_conf
  * return: 0 ok; -1 error:: can`t save new config   * return: 0 ok; -1 error:: can`t save new config
 */  */
 int CreateConfig(const char *csConfigName, sl_config * __restrict cfg);  int CreateConfig(const char *csConfigName, sl_config * __restrict cfg);
 /*  
  * LoadConfig() Load config from file  
  * @csConfigName = Filename of config  
  * @cfg = Head list element  
  * return: 0 ok; -1 error:: can`t load config  
 */  
 int LoadConfig(const char *csConfigName, sl_config * __restrict cfg);  
 /*  
  * UnloadConfig() Unload config from memory and free resources  
  * @cfg = Head list element  
 */  
 void UnloadConfig(sl_config * __restrict cfg);  
   
   
 // cfg_GetErrno() Get error code of last operation  
 inline int cfg_GetErrno();  
 // cfg_GetError() Get error text of last operation  
 inline const char *cfg_GetError();  
   
   
 /*  /*
  * ReadConfig() Read from file and add new item to config list  
  * @f = file resource  
  * @cfg = Head list element  
  * return: 0 ok; -1 error:: can`t allocate memory  
 */  
 int ReadConfig(FILE *f, sl_config * __restrict cfg);  
 /*  
  * WriteConfig() Write to file from items in config list   * WriteConfig() Write to file from items in config list
  * @f = file resource   * @f = file resource
  * @cfg = Head list element   * @cfg = Head list element
Line 147  int ConcatConfig(sl_config * __restrict cfg, sl_config Line 160  int ConcatConfig(sl_config * __restrict cfg, sl_config
  * return: 0 ok; -1 error:: can`t merge lists   * return: 0 ok; -1 error:: can`t merge lists
 */  */
 int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg);  int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg);
   #endif
   
   
 /*  /*
 * cfg_FindAttribute() Find attribute position in config list * cfg_findAttribute() - Find attribute position in config file
 * @cfg = Head list element *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}]   * @csSec = Config section //[{csSec}]
  * @csAttr = Config attribute //{csAttr} = ...   * @csAttr = Config attribute //{csAttr} = ...
  * return: 0 not found item; -1 error: null parameters; >0 position in list   * return: 0 not found item; -1 error: null parameters; >0 position in list
*/ */
inline int cfg_FindAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr);inline 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
    *
    * @cfg = Config root
    * @csSec = Config section //[{csSec}], if NULL unset in *default* section
    * @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 *csSec, const char *csAttr);
   
   #if 0
   /*
  * cfg_SetAttribute() Set item in config list or add new item if not exists   * cfg_SetAttribute() Set item in config list or add new item if not exists
  * @cfg = Head list element   * @cfg = Head list element
  * @csSec = Config section //[{csSec}], if NULL set in *default* section   * @csSec = Config section //[{csSec}], if NULL set in *default* section
Line 184  int cfg_UnsetAttribute(sl_config * __restrict cfg, con Line 211  int cfg_UnsetAttribute(sl_config * __restrict cfg, con
 inline const u_char *cfg_GetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr);  inline const u_char *cfg_GetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr);
   
 /*  /*
  * cfg_FirstItem() Get first item from config list and return his value  
  * @cfg = Head list element  
  * return: NULL if no items in list; !=NULL first pair item  
 */  
 inline struct tagPair *cfg_FirstItem(sl_config * __restrict cfg);  
   
 /*  
  * cfg_LoadAttribute() Extended get attribute, if not found item return *default value*   * cfg_LoadAttribute() Extended get attribute, if not found item return *default value*
  * @cfg = Head list element   * @cfg = Head list element
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section   * @csSec = Config section //[{csSec}], if NULL unset in *default* section
Line 202  inline struct tagPair *cfg_FirstItem(sl_config * __res Line 222  inline struct tagPair *cfg_FirstItem(sl_config * __res
 */  */
 int cfg_LoadAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr,   int cfg_LoadAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, 
                 u_char * __restrict psVal, int ValLen, const char *csDefValue);                  u_char * __restrict psVal, int ValLen, const char *csDefValue);
   #endif
   
   
 #endif  #endif
Removed from v.1.6  
changed lines
  Added in v.1.6.4.1

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