--- libaitcfg/src/pwd.c	2012/09/19 15:22:32	1.2
+++ libaitcfg/src/pwd.c	2013/01/17 13:42:10	1.2.4.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: pwd.c,v 1.2 2012/09/19 15:22:32 misho Exp $
+* $Id: pwd.c,v 1.2.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 "aitpwd.h"
 
 
 #pragma GCC visibility push(hidden)
@@ -101,13 +100,13 @@ cfgReadPasswd(FILE *f, pwd_root_t * __restrict pwd)
 			continue;
 		} else {
 			*pos = 0;
-			io_TrimStr(line);
+			str_Trim(line);
 		}
 
 		/* *NEW USER* alloc new element */
-		u = io_malloc(sizeof(struct tagUser));
+		u = e_malloc(sizeof(struct tagUser));
 		if (!u) {
-			cfg_SetErr(io_GetErrno(), "%s", io_GetError());
+			cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
 			return -1;
 		} else {
 			memset(u, 0, sizeof(struct tagUser));
@@ -171,7 +170,7 @@ cfgReadPasswd(FILE *f, pwd_root_t * __restrict pwd)
 
 		/* add to tree */
 		AIT_KEY(&u->usr_name) = crcFletcher16(AIT_GET_LIKE(&u->usr_name, u_short*), 
-				io_align(AIT_LEN(&u->usr_name) - 1, 2) / 2);
+				E_ALIGN(AIT_LEN(&u->usr_name) - 1, 2) / 2);
 
 		PWD_LOCK(pwd);
 		RB_INSERT(tagPWD, pwd, u);