--- libaitcfg/inc/aitcfg.h	2013/01/17 13:33:30	1.10.4.1
+++ libaitcfg/inc/aitcfg.h	2014/03/19 18:38:43	1.15
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcfg.h,v 1.10.4.1 2013/01/17 13:33:30 misho Exp $
+* $Id: aitcfg.h,v 1.15 2014/03/19 18:38:43 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2014
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -56,23 +56,28 @@ struct tagCfg {
 	ait_val_t		cfg_attr;
 	ait_val_t		cfg_val;
 
-	SLIST_ENTRY(tagCfg)	cfg_next;
+	TAILQ_ENTRY(tagCfg)	cfg_next;
 	RB_ENTRY(tagCfg)	cfg_node;
 };
 typedef struct tagRC {
 	pthread_mutex_t		rc_mtx;
 
-	struct tagCfg		*slh_first;
+	struct tagCfg		*tqh_first;
+	struct tagCfg		**tqh_last;
 	struct tagCfg		*rbh_root;
 } cfg_root_t;
 #define CFG_RC_LOCK(x)		pthread_mutex_lock(&(x)->rc_mtx)
 #define CFG_RC_UNLOCK(x)	pthread_mutex_unlock(&(x)->rc_mtx)
 
+#define CFG_SECTION(x)		(assert((x)), AIT_GET_LIKE(&((struct tagCfg*) (x))->cfg_sec, const char*))
+#define CFG_ATTRIBUTE(x)	(assert((x)), AIT_GET_LIKE(&((struct tagCfg*) (x))->cfg_attr, const char*))
+#define CFG_VALUE(x)		(assert((x)), AIT_GET_LIKE(&((struct tagCfg*) (x))->cfg_val, const char*))
 
+
 // cfg_GetErrno() Get error code of last operation
-inline int cfg_GetErrno();
+int cfg_GetErrno();
 // cfg_GetError() Get error text of last operation
-inline const char *cfg_GetError();
+const char *cfg_GetError();
 
 
 /*
@@ -84,11 +89,17 @@ inline const char *cfg_GetError();
 /*
  * cfgInitConfig() - Init config root
  *
- * @cfg = Config root
- * return: -1 error or 0 ok
+ * return: NULL error or !=NULL allocated config root
  */
-int cfgInitConfig(cfg_root_t * __restrict cfg);
+cfg_root_t *cfgInitConfig();
 /*
+ * cfgEndConfig() - Free resources & config root
+ *
+ * @pcfg = Config root
+ * return: none
+ */
+void cfgEndConfig(cfg_root_t **pcfg);
+/*
  * cfgLoadConfig() - Load config from file
  *
  * @cfgName = Config filename
@@ -179,24 +190,32 @@ int cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_r
 int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg);
 
 /*
+ * cfg_getSection() - Get entire section attributes into array
+ *
+ * @cfg = Config root
+ * @csSec = Config section //[{csSec}]
+ * return: NULL not found or !=NULL allocated array, must free with array_Destroy() after use!
+ */
+array_t *cfg_getSection(cfg_root_t * __restrict cfg, const char *csSec);
+/*
  * cfg_findAttribute() - Find attribute position in config file
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}]
- * @csAttr = Config attribute //{csAttr} = ...
+ * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
  * return: 0 not found item, -1 error or >0 position in list
  */
-inline int cfg_findAttribute(cfg_root_t * __restrict cfg, 
+int cfg_findAttribute(cfg_root_t * __restrict cfg, 
 		const char *csSec, const char *csAttr);
 /*
  * cfg_getAttribute() - Get item from config and return value from it
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
- * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute
+ * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
  * return: NULL item not found or null parameters, !=NULL value const string
  */
-inline const char *cfg_getAttribute(cfg_root_t * __restrict cfg, 
+const char *cfg_getAttribute(cfg_root_t * __restrict cfg, 
 		const char *csSec, const char *csAttr);
 /*
  * cfg_setAttribute() - Set item in config or adding new item if not exists
@@ -214,7 +233,7 @@ int cfg_setAttribute(cfg_root_t * __restrict cfg, cons
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
- * @csAttr = Config attribute //{csAttr} = ...
+ * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
  * return: 0 item not found, -1 error or 1 removed item
  */
 int cfg_unsetAttribute(cfg_root_t * __restrict cfg, const char *csSec, 
@@ -225,7 +244,7 @@ int cfg_unsetAttribute(cfg_root_t * __restrict cfg, co
  *
  * @cfg = Config root
  * @csSec = Config section //[{csSec}], if NULL unset in *default* section
- * @csAttr = Config attribute //{csAttr} = ...
+ * @csAttr = Config attribute //{csAttr} = ..., if NULL as *any* attribute
  * @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}