[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.4.3 and 1.6.4.6

version 1.6.4.3, 2012/04/02 15:39:55 version 1.6.4.6, 2012/04/03 11:51:52
Line 49  SUCH DAMAGE. Line 49  SUCH DAMAGE.
   
 #include <aitio.h>  #include <aitio.h>
 #include <atree.h>  #include <atree.h>
   #include <pthread.h>
   
   
 struct tagCfg {  struct tagCfg {
Line 60  struct tagCfg { Line 61  struct tagCfg {
         RB_ENTRY(tagCfg)        cfg_node;          RB_ENTRY(tagCfg)        cfg_node;
 };  };
 typedef struct tagRC {  typedef struct tagRC {
 #ifdef HAVE_LIBPTHREAD  
         pthread_mutex_t         rc_mtx;          pthread_mutex_t         rc_mtx;
#endif
         struct tagCfg           *slh_first;          struct tagCfg           *slh_first;
         struct tagCfg           *rbh_root;          struct tagCfg           *rbh_root;
 } cfg_root_t;  } cfg_root_t;
 #ifdef HAVE_LIBPTHREAD  
 #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)
 #else  
 #define CFG_RC_LOCK(x)  
 #define CFG_RC_UNLOCK(x)  
 #endif  
   
   
 // cfg_GetErrno() Get error code of last operation  // cfg_GetErrno() Get error code of last operation
Line 83  inline const char *cfg_GetError(); Line 78  inline const char *cfg_GetError();
   
 /*  /*
  * Macros for config library.   * Macros for config library.
*/ */
 #define CFG_ISEMPTY(x)          RB_EMPTY((x))  #define CFG_ISEMPTY(x)          RB_EMPTY((x))
   
   
 /*  /*
    * cfgInitConfig() - Init config root
    *
    * @cfg = Config root
    * return: -1 error or 0 ok
    */
   int cfgInitConfig(cfg_root_t * __restrict cfg);
   /*
  * cfgLoadConfig() - Load config from file   * cfgLoadConfig() - Load config from file
  *   *
  * @cfgName = Config filename   * @cfgName = Config filename
Line 111  void cfgUnloadConfig(cfg_root_t * __restrict cfg); Line 113  void cfgUnloadConfig(cfg_root_t * __restrict cfg);
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
  */   */
 int cfgReadConfig(FILE *f, cfg_root_t * __restrict 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);
   
 #if 0  #if 0
 /*  /*
Line 130  int CreateConfig(const char *csConfigName, sl_config * Line 141  int CreateConfig(const char *csConfigName, sl_config *
   
   
 /*  /*
  * 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   * ConcatConfig() Concat two list in one
  * @cfg = Head list element of main list   * @cfg = Head list element of main list
  * @add_cfg = Head list element of added list   * @add_cfg = Head list element of added list
Line 204  int cfg_setAttribute(cfg_root_t * __restrict cfg, cons Line 199  int cfg_setAttribute(cfg_root_t * __restrict cfg, cons
 int cfg_unsetAttribute(cfg_root_t * __restrict cfg, const char *csSec,   int cfg_unsetAttribute(cfg_root_t * __restrict cfg, const char *csSec, 
                 const char *csAttr);                  const char *csAttr);
   
 #if 0  
 /*  /*
 * cfg_LoadAttribute() Extended get attribute, if not found item return *default value* * cfg_loadAttribute() - Get guarded attribute, if not found item return *default value*
 * @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} = ...
 * @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  #endif
Removed from v.1.6.4.3  
changed lines
  Added in v.1.6.4.6

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