--- libaitcfg/src/parse.c	2012/09/19 15:22:32	1.11
+++ libaitcfg/src/parse.c	2013/01/17 13:42:10	1.11.4.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: parse.c,v 1.11 2012/09/19 15:22:32 misho Exp $
+* $Id: parse.c,v 1.11.4.1 2013/01/17 13:42:10 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
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,6 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF TH
 SUCH DAMAGE.
 */
 #include "global.h"
-#include "aitcfg.h"
 
 
 static inline void
@@ -93,7 +92,7 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 			continue;
 		} else {
 			*psAttr = 0;
-			io_TrimStr(line);
+			str_Trim(line);
 		}
 
 		if (flg) {
@@ -109,14 +108,14 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 			/* concat line to value */
 			AIT_SET_STRCAT(&av->cfg_val, line);
 			if (!flg && AIT_ADDR(&av->cfg_val))
-				io_UnquotStr((char*) AIT_GET_STR(&av->cfg_val));
+				str_Unquot((char*) AIT_GET_STR(&av->cfg_val));
 			continue;
 		}
 
 		/* *NEW PAIR* alloc new pair element */
-		av = io_malloc(sizeof(struct tagCfg));
+		av = e_malloc(sizeof(struct tagCfg));
 		if (!av) {
-			cfg_SetErr(io_GetErrno(), "%s", io_GetError());
+			cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
 			return -1;
 		} else {
 			memset(av, 0, sizeof(struct tagCfg));
@@ -146,13 +145,13 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 				flg = 0;
 				strlcpy(szSection, line + 1, sizeof szSection);
 			} else
-				ioDEBUG(7, "Ignore section '%s' ... not found ']'", line);
+				EDEBUG(7, "Ignore section '%s' ... not found ']'", line);
 			continue;
 		}
 		/* parse pair */
 		if (!(psAttr = strchr(line, '='))) {
 			AIT_SET_STR(&av->cfg_val, line);
-			ioDEBUG(7, "Ignore a/v '%s' ... not found '='", line);
+			EDEBUG(7, "Ignore a/v '%s' ... not found '='", line);
 			continue;
 		} else {
 			*psAttr = 0;
@@ -164,17 +163,17 @@ cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg)
 		if (*szSection) {
 			AIT_SET_STR(&av->cfg_sec, szSection);
 			AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), 
-					io_align(AIT_LEN(&av->cfg_sec) - 1, 2) / 2);
+					E_ALIGN(AIT_LEN(&av->cfg_sec) - 1, 2) / 2);
 		}
 
-		io_RTrimStr(psAttr);
-		io_LTrimStr(psVal);
+		str_RTrim(psAttr);
+		str_LTrim(psVal);
 		if (!flg)
-			io_UnquotStr(psVal);
+			str_Unquot(psVal);
 		AIT_SET_STR(&av->cfg_val, psVal);
 		AIT_SET_STR(&av->cfg_attr, psAttr);
 		AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), 
-				io_align(AIT_LEN(&av->cfg_attr) - 1, 2) / 2);
+				E_ALIGN(AIT_LEN(&av->cfg_attr) - 1, 2) / 2);
 
 		CFG_RC_LOCK(cfg);
 		RB_INSERT(tagRC, cfg, av);
@@ -379,22 +378,22 @@ cfgReadLines(FILE *f, const char *delim, const char *e
 			continue;
 		} else {
 			*psAttr = 0;
-			io_TrimStr(line);
+			str_Trim(line);
 			if (!*line)
 				continue;
 		}
 
-		if (!io_MakeAV2(line, delim, &p, &psVal))
+		if (!av_MakeExt(line, delim, &p, &psVal))
 			continue;
 		else {
-			io_RTrimStr(p);
-			io_LTrimStr(psVal);
+			str_RTrim(p);
+			str_LTrim(psVal);
 		}
-		if (!io_MakeAV2(p, SEC_LINES_DELIM, &psSec, &psAttr))
+		if (!av_MakeExt(p, SEC_LINES_DELIM, &psSec, &psAttr))
 			psAttr = p;
 
 		/* *NEW PAIR* alloc new pair element */
-		av = io_malloc(sizeof(struct tagCfg));
+		av = e_malloc(sizeof(struct tagCfg));
 		if (!av) {
 			LOGERR;
 			return -1;
@@ -404,13 +403,13 @@ cfgReadLines(FILE *f, const char *delim, const char *e
 		if (psSec) {
 			AIT_SET_STR(&av->cfg_sec, psSec);
 			AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), 
-					io_align(AIT_LEN(&av->cfg_sec) - 1, 2) / 2);
+					E_ALIGN(AIT_LEN(&av->cfg_sec) - 1, 2) / 2);
 		}
 		if (psVal)
 			AIT_SET_STR(&av->cfg_val, psVal);
 		AIT_SET_STR(&av->cfg_attr, psAttr);
 		AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), 
-				io_align(AIT_LEN(&av->cfg_attr) - 1, 2) / 2);
+				E_ALIGN(AIT_LEN(&av->cfg_attr) - 1, 2) / 2);
 
 		CFG_RC_LOCK(cfg);
 		/* find & delete duplicates */
@@ -421,7 +420,7 @@ cfgReadLines(FILE *f, const char *delim, const char *e
 			AIT_FREE_VAL(&d->cfg_val);
 			AIT_FREE_VAL(&d->cfg_attr);
 			AIT_FREE_VAL(&d->cfg_sec);
-			io_free(d);
+			e_free(d);
 		}
 
 		SLIST_INSERT_HEAD(cfg, av, cfg_next);
@@ -440,7 +439,7 @@ cfgReadLines(FILE *f, const char *delim, const char *e
  * @eol = End of line string, if =NULL default is "\n"
  * @section = Export only section, if =NULL default is all
  * @cfg = Config root
- * return: =NULL error or !=NULL exported data, must be free after use with io_freeVar()
+ * return: =NULL error or !=NULL exported data, must be free after use with ait_freeVar()
  */
 ait_val_t *
 cfgWriteLines(FILE *f, const char *delim, const char *eol, const char *section, cfg_root_t * __restrict cfg)
@@ -454,8 +453,8 @@ cfgWriteLines(FILE *f, const char *delim, const char *
 		delim = ATR_LINES_DELIM;
 	if (!eol)
 		eol = EOL_LINES_DELIM;
-	if (!(v = io_allocVar())) {
-		cfg_SetErr(io_GetErrno(), "%s", io_GetError());
+	if (!(v = ait_allocVar())) {
+		cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
 		return NULL;
 	} else
 		AIT_INIT_VAL2(v, string);