--- libaitcfg/inc/aitcfg.h	2012/04/02 14:39:02	1.6.4.1
+++ libaitcfg/inc/aitcfg.h	2012/04/03 14:39:20	1.6.4.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcfg.h,v 1.6.4.1 2012/04/02 14:39:02 misho Exp $
+* $Id: aitcfg.h,v 1.6.4.9 2012/04/03 14:39:20 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -49,6 +49,7 @@ SUCH DAMAGE.
 
 #include <aitio.h>
 #include <atree.h>
+#include <pthread.h>
 
 
 struct tagCfg {
@@ -60,19 +61,13 @@ struct tagCfg {
 	RB_ENTRY(tagCfg)	cfg_node;
 };
 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
@@ -83,11 +78,18 @@ inline const char *cfg_GetError();
 
 /*
  * Macros for config library.
-*/
+ */
 #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
  *
  * @cfgName = Config filename
@@ -102,6 +104,16 @@ int cfgLoadConfig(const char *cfgName, cfg_root_t * __
  * return: none
  */
 void cfgUnloadConfig(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);
 
 /*
  * cfgReadConfig() - Read file and add new item at config root
@@ -111,64 +123,39 @@ void cfgUnloadConfig(cfg_root_t * __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!
- * @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);
+ * 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);
 /*
- * 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);
-
-
+ * 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);
 /*
- * 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);
+ * 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_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
- * @cfg = Head list element of main list
- * @add_cfg = Head list element of added list
- * return: 0 ok; -1 error:: can`t concat lists
-*/
-int ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg);
-
-/*
- * MergeConfig() Marge two list in one cfg and destroy add_cfg
- * @cfg = Head list element of main list
- * @add_cfg = Head list element of merged list (destroy after all!)
- * return: 0 ok; -1 error:: can`t merge lists
-*/
-int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg);
-#endif
-
-/*
  * cfg_findAttribute() - Find attribute position in config file
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}]
  * @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(cfg_root_t * __restrict cfg, 
 		const char *csSec, const char *csAttr);
@@ -178,51 +165,44 @@ inline int cfg_findAttribute(cfg_root_t * __restrict c
  * @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
+ * 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 = Head list element
+ * 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
- * @csAttr = Config attribute //{csAttr} = ..., if NULL set as *any* attribute
+ * @csAttr = Config attribute //{csAttr} = ...
  * @csVal = Config value //... = {csVal} to setup
- * return: 0 nothing changed, -1 error: not enough memory; 1 find and update item; 2 added new item
-*/
-int cfg_SetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, const u_char *csVal);
+ * return: 0 nothing changed, -1 error, 1 found and updated item or 2 added new item
+ */
+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 = Head list element
+ * cfg_unsetAttribute() - Unset item from config and free resources
+ *
+ * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
- * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute
- * return: 0 item not found, -1 error: null parameters; >0 position in list
-*/
-int cfg_UnsetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_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);
+ * @csAttr = Config attribute //{csAttr} = ...
+ * return: 0 item not found, -1 error or 1 removed item
+ */
+int cfg_unsetAttribute(cfg_root_t * __restrict cfg, const char *csSec, 
+		const char *csAttr);
 
 /*
- * cfg_LoadAttribute() Extended get attribute, if not found item return *default value*
- * @cfg = Head list element
+ * cfg_loadAttribute() - Get guarded attribute, if not found item return *default value*
+ *
+ * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
- * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute
- * @psVal = Return buffer for item Value //... = {psVal}
- * @ValLen = Length of buffer //{psVal} for return
- * @csDefValue = *Default Value* for return in //{psVal}, if not found item in config list
- * return: 0 item not found, -1 error: null parameters; >0 number of copied bytes in //{psVal}
-*/
-int cfg_LoadAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, 
-		u_char * __restrict psVal, int ValLen, const char *csDefValue);
-#endif
+ * @csAttr = Config attribute //{csAttr} = ...
+ * @val = Return buffer for item Value //... = {val}
+ * @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}
+ */
+int cfg_loadAttribute(cfg_root_t * __restrict cfg, const char *csSec, 
+		const char *csAttr, ait_val_t * __restrict val, const char *csDefValue);
 
 
 #endif