[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.5.2.1 and 1.7.4.1

version 1.5.2.1, 2011/05/01 17:23:29 version 1.7.4.1, 2012/07/25 12:37:06
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;#include <pthread.h>
        unsigned char   *psAttribute; 
        unsigned char   *psValue; 
        struct tagPair *sle_next; 
}; 
   
 struct tagHead {  
         struct tagPair *slh_first;  
 };  
 typedef struct tagHead sl_config;  
   
   struct tagCfg {
           ait_val_t               cfg_sec;
           ait_val_t               cfg_attr;
           ait_val_t               cfg_val;
   
/*        SLIST_ENTRY(tagCfg)     cfg_next;
 * Macros for config library. Typecast string to specific config string format.        RB_ENTRY(tagCfg)        cfg_node;
*/};
#define CFG(x)          (unsigned char *)(x)typedef struct tagRC {
         pthread_mutex_t         rc_mtx;
   
#define CFG_ISSET(x)     ((long) cfg_FirstItem((x)))        struct tagCfg           *slh_first;
         struct tagCfg           *rbh_root;
 } cfg_root_t;
 #define CFG_RC_LOCK(x)             pthread_mutex_lock(&(x)->rc_mtx)
 #define CFG_RC_UNLOCK(x)        pthread_mutex_unlock(&(x)->rc_mtx)
   
   
 /*  
  * InitConfig() Head initializing function for config  
  * @cfg = New head element for init  
  * return: 0 ok; -1 error:: new head element is null  
 */  
 inline int InitConfig(sl_config * __restrict cfg);  
 /*  
  * 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);  
 /*  
  * 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  // cfg_GetErrno() Get error code of last operation
 inline int cfg_GetErrno();  inline int cfg_GetErrno();
 // cfg_GetError() Get error text of last operation  // cfg_GetError() Get error text of last operation
Line 110  inline const char *cfg_GetError(); Line 77  inline const char *cfg_GetError();
   
   
 /*  /*
 * ReadConfig() Read from file and add new item to config list * Macros for config library.
 * @f = file resource */
 * @cfg = Head list element#define CFG_ISEMPTY(x)          RB_EMPTY((x))
 * 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 
 * @f = file resource 
 * @cfg = Head list element 
 * return: 0 ok; -1 error:: can`t write to file 
*/ 
int WriteConfig(FILE *f, sl_config * __restrict cfg); 
   
 /*  
  * cfg_WriteConfig() Write to file from items in config list without whitespaces!  
  * @f = file resource  
  * @cfg = Head list element  
  * return: 0 ok; -1 error:: can`t write to file  
 */  
 int cfg_WriteConfig(FILE *f, sl_config * __restrict cfg);  
   
 /*  /*
 * ConcatConfig() Concat two list in one * cfgInitConfig() - Init config root
 * @cfg = Head list element of main list *
 * @add_cfg = Head list element of added list * @cfg = Config root
 * return: 0 ok; -1 error:: can`t concat lists * return: -1 error or 0 ok
*/ */
int ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg);int cfgInitConfig(cfg_root_t * __restrict cfg);
 /*
  * 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 destroy resources
  *
  * @cfg = Config root
  * return: none
  */
 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);
   
 /*  /*
 * MergeConfig() Marge two list in one cfg and destroy add_cfg * cfgReadConfig() - Read file and add new item at config root
 * @cfg = Head list element of main list *
 * @add_cfg = Head list element of merged list (destroy after all!) * @f = File resource
 * return: 0 ok; -1 error:: can`t merge lists * @cfg = Config root
*/ * return: -1 error or 0 ok
int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg); */
 int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg);
 /*
  * cfgWriteConfig() - Write config from memory
  *
  * @f = File handle
  * @cfg = Config root
  * @whitespace = Additional whitespace characters to file
  * return: -1 error or 0 ok
  */
 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
  *
  * @cfg = Config root of main list
  * @add_cfg = Merged config will be destroy after merge
  * return: -1 error or 0 ok
  */
 int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg);
   
   
 /*  /*
 * 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 or >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_SetAttribute() Set item in config list or add new item if not exists * cfg_getAttribute() - Get item from config and return value from it
 * @cfg = Head list element *
  * @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);
 /*
  * cfg_setAttribute() - Set item in config or adding new item if not exists
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL set in *default* section   * @csSec = Config section //[{csSec}], if NULL set in *default* section
 * @csAttr = Config attribute //{csAttr} = ..., if NULL set as *any* attribute * @csAttr = Config attribute //{csAttr} = ...
  * @csVal = Config value //... = {csVal} to setup   * @csVal = Config value //... = {csVal} to setup
 * return: 0 nothing changed, -1 error: not enough memory; 1 find and update item; 2 added new item * return: 0 nothing changed, -1 error, 1 found and updated item or 2 added new item
*/ */
int cfg_SetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, const u_char *csVal);int cfg_setAttribute(cfg_root_t * __restrict cfg, const char *csSec, 
                 const char *csAttr, const char *csVal);
 /*  /*
 * cfg_UnsetAttribute() Unset item from config list and free resources * cfg_unsetAttribute() - Unset item from config and free resources
 * @cfg = Head list element *
  * @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} = ...
 * return: 0 item not found, -1 error: null parameters; >0 position in list * return: 0 item not found, -1 error or 1 removed item
*/ */
int cfg_UnsetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr);int cfg_unsetAttribute(cfg_root_t * __restrict cfg, const char *csSec, 
/*                const char *csAttr);
 * cfg_GetAttribute() Get item from config list and return his value 
 * @cfg = Head list element 
 * @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 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_loadAttribute() - Get guarded attribute, if not found item return *default value*
 * @cfg = Head list element *
 * return: NULL if no items in list; !=NULL first pair item * @cfg = Config root
*/ 
inline struct tagPair *cfg_FirstItem(sl_config * __restrict cfg); 
 
/* 
 * cfg_LoadAttribute() Extended get attribute, if not found item return *default value* 
 * @cfg = Head list element 
  * @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} = ...
 * @psVal = Return buffer for item Value //... = {psVal} * @val = Return buffer for item Value //... = {val}
 * @ValLen = Length of buffer //{psVal} for return * @csDefValue = *Default Value* for return in //{val}, if not found item in config
 * @csDefValue = *Default Value* for return in //{psVal}, if not found item in config list * return: 0 item not found, -1 error or >0 number of copied bytes in //{val}
 * return: 0 item not found, -1 error: null parameters; >0 number of copied bytes in //{psVal} */
*/int cfg_loadAttribute(cfg_root_t * __restrict cfg, const char *csSec, 
int cfg_LoadAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr,                 const char *csAttr, ait_val_t * __restrict val, const char *csDefValue);
                u_char * __restrict psVal, int ValLen, const char *csDefValue); 
   
   
 #endif  #endif
Removed from v.1.5.2.1  
changed lines
  Added in v.1.7.4.1

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