--- libaitcfg/src/aitcfg.c	2025/08/19 10:42:28	1.16.6.1
+++ libaitcfg/src/aitcfg.c	2025/08/19 11:43:53	1.17
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcfg.c,v 1.16.6.1 2025/08/19 10:42:28 misho Exp $
+* $Id: aitcfg.c,v 1.17 2025/08/19 11:43:53 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -160,13 +160,15 @@ cfgEndConfig(cfg_root_t **pcfg)
  * cfgInitConfigExt() - Init existed config root
  *
  * @cfg = Config root
- * return: NULL error or !=NULL inited config root
+ * return: -1 error or 0 inited config root
  */
-cfg_root_t *
+int
 cfgInitConfigExt(cfg_root_t * __restrict cfg)
 {
-	if (!TAILQ_EMPTY(cfg) || !RB_EMPTY(cfg))
-		cfgUnloadConfig(cfg);
+	if (!cfg) {
+		cfg_SetErr(EINVAL, "Invalid parameter");
+		return -1;
+	}
 
 	memset(cfg, 0, sizeof(cfg_root_t));
 
@@ -174,7 +176,7 @@ cfgInitConfigExt(cfg_root_t * __restrict cfg)
 
 	TAILQ_INIT(cfg);
 	RB_INIT(cfg);
-	return cfg;
+	return 0;
 }
 
 /*
@@ -190,19 +192,9 @@ cfgLoadConfig(const char *cfgName, cfg_root_t * __rest
 	FILE *f;
 	int ret;
 
-	if (!cfgName || !cfg) {
+	if (!cfgName || cfgInitConfigExt(cfg)) {
 		cfg_SetErr(EINVAL, "Invalid parameter(s)");
 		return -1;
-	} else {
-		if (!TAILQ_EMPTY(cfg) || !RB_EMPTY(cfg))
-			cfgUnloadConfig(cfg);
-
-		memset(cfg, 0, sizeof(cfg_root_t));
-
-		pthread_mutex_init(&cfg->rc_mtx, NULL);
-
-		TAILQ_INIT(cfg);
-		RB_INIT(cfg);
 	}
 
 	f = fopen(cfgName, "r");
@@ -258,6 +250,7 @@ cfgUnloadConfig(cfg_root_t * __restrict cfg)
 
 	cfgClearConfig(cfg);
 	pthread_mutex_destroy(&cfg->rc_mtx);
+	memset(&cfg->rc_mtx, 0, sizeof cfg->rc_mtx);
 }
 
 /*