--- libaitcfg/src/parse.c	2014/01/29 23:48:34	1.13
+++ libaitcfg/src/parse.c	2014/01/30 08:13:09	1.13.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: parse.c,v 1.13 2014/01/29 23:48:34 misho Exp $
+* $Id: parse.c,v 1.13.2.1 2014/01/30 08:13:09 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -46,6 +46,7 @@ SUCH DAMAGE.
 #include "global.h"
 
 
+/*
 static inline void
 _invertQueue(cfg_root_t * __restrict cfg)
 {
@@ -57,6 +58,7 @@ _invertQueue(cfg_root_t * __restrict cfg)
 	}
 	cfg->slh_first = prev;
 }
+*/
 
 
 /*
@@ -120,7 +122,7 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 		} else {
 			memset(av, 0, sizeof(struct tagCfg));
 			CFG_RC_LOCK(cfg);
-			SLIST_INSERT_HEAD(cfg, av, cfg_next);
+			TAILQ_INSERT_TAIL(cfg, av, cfg_next);
 			CFG_RC_UNLOCK(cfg);
 		}
 
@@ -204,8 +206,8 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
 	}
 
 	CFG_RC_LOCK(cfg);
-	_invertQueue(cfg);
-	SLIST_FOREACH(av, cfg, cfg_next) {
+//	_invertQueue(cfg);
+	TAILQ_FOREACH(av, cfg, cfg_next) {
 		/* empty lines or comment */
 		if (AIT_ISEMPTY(&av->cfg_attr)) {
 			if (AIT_ISEMPTY(&av->cfg_val))
@@ -220,7 +222,7 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
 			strlcpy(szSection, AIT_GET_STR(&av->cfg_sec), sizeof szSection);
 			if (!cfg_Write(f, "[%s]\n", AIT_GET_STR(&av->cfg_sec))) {
 				LOGERR;
-				_invertQueue(cfg);
+//				_invertQueue(cfg);
 				CFG_RC_UNLOCK(cfg);
 				return -1;
 			}
@@ -228,7 +230,7 @@ cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
 			memset(szSection, 0, sizeof szSection);
 			if (!cfg_Write(f, "[]\n")) {
 				LOGERR;
-				_invertQueue(cfg);
+//				_invertQueue(cfg);
 				CFG_RC_UNLOCK(cfg);
 				return -1;
 			}
@@ -249,12 +251,12 @@ skip_sec:
 		/* write */
 		if (!cfg_Write(f, "%s\n", line)) {
 			LOGERR;
-			_invertQueue(cfg);
+//			_invertQueue(cfg);
 			CFG_RC_UNLOCK(cfg);
 			return -1;
 		}
 	}
-	_invertQueue(cfg);
+//	_invertQueue(cfg);
 	CFG_RC_UNLOCK(cfg);
 
 	if (whitespace) {
@@ -285,18 +287,16 @@ cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_
 	CFG_RC_LOCK(add_cfg);
 	CFG_RC_LOCK(cfg);
 
-	/* concat lists */
-	for (item = SLIST_FIRST(cfg); SLIST_NEXT(item, cfg_next); item = SLIST_NEXT(item, cfg_next));
-	SLIST_NEXT(item, cfg_next) = SLIST_FIRST(add_cfg);
-
-	/* concat red-black trees */
-	SLIST_FOREACH(item, add_cfg, cfg_next)
+	/* concat lists & red-black trees */
+	TAILQ_FOREACH(item, add_cfg, cfg_next) {
+		TAILQ_INSERT_TAIL(cfg, item, cfg_next);
 		RB_INSERT(tagRC, cfg, item);
+	}
 
 	CFG_RC_UNLOCK(cfg);
 
-	add_cfg->slh_first = NULL;
-	add_cfg->rbh_root = NULL;
+	TAILQ_INIT(add_cfg);
+	RB_INIT(add_cfg);
 	CFG_RC_UNLOCK(add_cfg);
 	pthread_mutex_destroy(&add_cfg->rc_mtx);
 	return 0;
@@ -322,9 +322,9 @@ cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t
 	CFG_RC_LOCK(cfg);
 
 	/* merge lists */
-	SLIST_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) {
+	TAILQ_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) {
 		flg = 0;
-		SLIST_FOREACH_SAFE(merge, cfg, cfg_next, next) {
+		TAILQ_FOREACH_SAFE(merge, cfg, cfg_next, next) {
 			if (AIT_ISEMPTY(&merge->cfg_sec) && AIT_ISEMPTY(&item->cfg_sec)) {
 				flg = 1;
 				break;
@@ -338,16 +338,16 @@ cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t
 		}
 
 		if (!flg)
-			SLIST_INSERT_HEAD(cfg, item, cfg_next);
+			TAILQ_INSERT_TAIL(cfg, item, cfg_next);
 		else
-			SLIST_INSERT_AFTER(merge, item, cfg_next);
+			TAILQ_INSERT_AFTER(cfg, merge, item, cfg_next);
 		RB_INSERT(tagRC, cfg, item);
 	}
 
 	CFG_RC_UNLOCK(cfg);
 
-	add_cfg->slh_first = NULL;
-	add_cfg->rbh_root = NULL;
+	TAILQ_INIT(add_cfg);
+	RB_INIT(add_cfg);
 	CFG_RC_UNLOCK(add_cfg);
 	pthread_mutex_destroy(&add_cfg->rc_mtx);
 	return 0;
@@ -424,7 +424,7 @@ cfgReadLines(FILE *f, const char *delim, const char *e
 		/* find & delete duplicates */
 		if ((d = RB_FIND(tagRC, cfg, av))) {
 			RB_REMOVE(tagRC, cfg, d);
-			SLIST_REMOVE(cfg, d, tagCfg, cfg_next);
+			TAILQ_REMOVE(cfg, d, cfg_next);
 
 			AIT_FREE_VAL(&d->cfg_val);
 			AIT_FREE_VAL(&d->cfg_attr);
@@ -432,7 +432,7 @@ cfgReadLines(FILE *f, const char *delim, const char *e
 			e_free(d);
 		}
 
-		SLIST_INSERT_HEAD(cfg, av, cfg_next);
+		TAILQ_INSERT_TAIL(cfg, av, cfg_next);
 		RB_INSERT(tagRC, cfg, av);
 		CFG_RC_UNLOCK(cfg);
 	}
@@ -468,7 +468,7 @@ cfgWriteLines(FILE *f, const char *delim, const char *
 	} else
 		AIT_INIT_VAL2(v, string);
 
-	SLIST_FOREACH(av, cfg, cfg_next) {
+	TAILQ_FOREACH(av, cfg, cfg_next) {
 		if (AIT_ISEMPTY(&av->cfg_attr))
 			continue;
 		if (section) {