--- libaitcfg/src/queue.c	2012/09/19 15:22:32	1.11
+++ libaitcfg/src/queue.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: queue.c,v 1.11 2012/09/19 15:22:32 misho Exp $
+* $Id: queue.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
@@ -58,10 +58,10 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch
 
 	if (csSec && *csSec)
 		AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, 
-				io_align(strlen(csSec), 2) / 2);
+				E_ALIGN(strlen(csSec), 2) / 2);
 	if (csAttr)
 		AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, 
-				io_align(strlen(csAttr), 2) / 2);
+				E_ALIGN(strlen(csAttr), 2) / 2);
 
 	if (!csAttr)
 		return RB_NFIND(tagRC, cfg, &fav);
@@ -101,10 +101,10 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c
 
 	if (csSec && *csSec)
 		AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, 
-				io_align(strlen(csSec), 2) / 2);
+				E_ALIGN(strlen(csSec), 2) / 2);
 	if (csAttr)
 		AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, 
-				io_align(strlen(csAttr), 2) / 2);
+				E_ALIGN(strlen(csAttr), 2) / 2);
 
 	SLIST_FOREACH(av, cfg, cfg_next) {
 		++cx;
@@ -143,7 +143,7 @@ cfg_unsetAttribute(cfg_root_t * __restrict cfg, const 
 	AIT_FREE_VAL(&av->cfg_val);
 	AIT_FREE_VAL(&av->cfg_attr);
 	AIT_FREE_VAL(&av->cfg_sec);
-	io_free(av);
+	e_free(av);
 	return 1;
 }
 
@@ -169,7 +169,7 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
 		/* adding new element */
 		section = _selectAttribute(cfg, csSec, NULL);
 
-		av = io_malloc(sizeof(struct tagCfg));
+		av = e_malloc(sizeof(struct tagCfg));
 		if (!av) {
 			LOGERR;
 			return -1;
@@ -187,12 +187,12 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
 		if (csSec && *csSec) {
 			AIT_SET_STR(&av->cfg_sec, csSec);
 			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);
 		}
 		AIT_SET_STR(&av->cfg_val, csVal ? csVal : "");
 		AIT_SET_STR(&av->cfg_attr, csAttr);
 		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);