--- libaitcfg/src/parse.c	2012/04/03 09:21:06	1.6.4.2
+++ libaitcfg/src/parse.c	2012/04/03 12:54:49	1.6.4.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: parse.c,v 1.6.4.2 2012/04/03 09:21:06 misho Exp $
+* $Id: parse.c,v 1.6.4.3 2012/04/03 12:54:49 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -257,28 +257,6 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
 
 #if 0
 /*
- * 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)
-{
-	return cfgWrite(f, cfg, 1);
-}
-
-/*
- * 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)
-{
-	return cfgWrite(f, cfg, 0);
-}
-
-/*
  * ConcatConfig() Concat two list in one
  * @cfg = Head list element of main list
  * @add_cfg = Head list element of added list
@@ -299,55 +277,54 @@ int ConcatConfig(sl_config * __restrict cfg, sl_config
 
 	return ret;
 }
+#endif
 
 /*
- * 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)
+ * 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)
 {
-	struct tagPair *item, *merge, *add_next, *next = NULL;
+	struct tagCfg *item, *merge, *add_next, *next = NULL;
 	int flg;
 
 	if (!cfg || !add_cfg)
 		return -1;
 
-	item = add_cfg->slh_first;
-	while (item) {
-		add_next = item->sle_next;
-
-		for (flg = 0, merge = cfg->slh_first, next = merge->sle_next; next; 
-				merge = merge->sle_next, next = merge->sle_next) {
-			if (!merge->psSection && !item->psSection) {
+	CFG_RC_LOCK(add_cfg);
+	CFG_RC_LOCK(cfg);
+	SLIST_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) {
+		flg = 0;
+		SLIST_FOREACH_SAFE(merge, cfg, cfg_next, next) {
+			if (AIT_ISEMPTY(&merge->cfg_sec) && AIT_ISEMPTY(&item->cfg_sec)) {
+				SLIST_INSERT_AFTER(merge, item, cfg_next);
+				RB_INSERT(tagRC, cfg, item);
 				flg = 1;
-				merge->sle_next = item;
-				item->sle_next = next;
 				break;
 			}
-			if (merge->psSection && item->psSection && 
-					!strcmp((char*) merge->psSection, (char*) item->psSection)) {
+			if (!AIT_ISEMPTY(&merge->cfg_sec) && !AIT_ISEMPTY(&item->cfg_sec) && 
+					!strcmp(AIT_GET_STR(&merge->cfg_sec), AIT_GET_STR(&item->cfg_sec))) {
+				SLIST_INSERT_AFTER(merge, item, cfg_next);
+				RB_INSERT(tagRC, cfg, item);
 				flg = 1;
-				merge->sle_next = item;
-				item->sle_next = next;
 				break;
 			}
 		}
 
 		if (!flg) {
-			if (!merge->sle_next) {
-				merge->sle_next = item;
-				item->sle_next = NULL;
-			} else
-				return -1;
+			SLIST_INSERT_AFTER(merge, item, cfg_next);
+			RB_INSERT(tagRC, cfg, item);
 		}
-
-		item = add_next;
 	}
+	CFG_RC_UNLOCK(cfg);
+	CFG_RC_UNLOCK(add_cfg);
 
 	add_cfg->slh_first = NULL;
-
+	add_cfg->rbh_root = NULL;
+	pthread_mutex_destroy(&add_cfg->rc_mtx);
 	return 0;
 }
-#endif