--- libelwix/src/vars.c	2013/01/17 10:05:35	1.1
+++ libelwix/src/vars.c	2013/03/07 16:24:32	1.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: vars.c,v 1.1 2013/01/17 10:05:35 misho Exp $
+* $Id: vars.c,v 1.2 2013/03/07 16:24:32 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -587,11 +587,11 @@ ait_sortVarsByVal(array_t * __restrict vars, int order
 		return;
 
 	if (cmp)
-		qsort(vars->arr_data, vars->arr_num, sizeof(void*), cmp);
+		qsort(vars->arr_data, vars->arr_num, sizeof(uintptr_t), cmp);
 	else if (order)
-		qsort(vars->arr_data, vars->arr_num, sizeof(void*), _cmp_arr_val_desc);
+		qsort(vars->arr_data, vars->arr_num, sizeof(uintptr_t), _cmp_arr_val_desc);
 	else
-		qsort(vars->arr_data, vars->arr_num, sizeof(void*), _cmp_arr_val_asc);
+		qsort(vars->arr_data, vars->arr_num, sizeof(uintptr_t), _cmp_arr_val_asc);
 }
 
 /*
@@ -608,9 +608,9 @@ ait_sortVarsByKey(array_t * __restrict vars, int order
 		return;
 
 	if (order)
-		qsort(vars->arr_data, vars->arr_num, sizeof(void*), _cmp_arr_key_desc);
+		qsort(vars->arr_data, vars->arr_num, sizeof(uintptr_t), _cmp_arr_key_desc);
 	else
-		qsort(vars->arr_data, vars->arr_num, sizeof(void*), _cmp_arr_key_asc);
+		qsort(vars->arr_data, vars->arr_num, sizeof(uintptr_t), _cmp_arr_key_asc);
 }
 
 /*
@@ -634,17 +634,17 @@ ait_findKeyVars(array_t * __restrict vars, u_short key
 	if (array_Copy(&tmp, vars) == -1)
 		return NULL;
 	else
-		qsort(tmp->arr_data, tmp->arr_num, sizeof(void*), _cmp_arr_key_asc);
+		qsort(tmp->arr_data, tmp->arr_num, sizeof(uintptr_t), _cmp_arr_key_asc);
 
 	/* binary search */
 	for (p = (const u_char*) tmp->arr_data, i = array_Size(tmp); i; i >>= 1) {
-		vv = (ait_val_t**) (p + (i >> 1) * sizeof(void*));
+		vv = (ait_val_t**) (p + (i >> 1) * sizeof(uintptr_t));
 		if (!(key - AIT_KEY(*vv))) {	/* found! */
 			v = *vv;
 			break;
 		}
 		if ((key - AIT_KEY(*vv)) > 0) {	/* move right key > current */
-			p = (const u_char*) vv + sizeof(void*);
+			p = (const u_char*) vv + sizeof(uintptr_t);
 			i--;
 		}				/* else move left */
 	}
@@ -754,7 +754,7 @@ ait_findKeyHash(array_t * __restrict vars, const char 
  * return: -1 error or >0 copied bytes to variable
  */
 int
-io_sprintfVar(ait_val_t * __restrict v, const char *fmt, ...)
+ait_sprintfVar(ait_val_t * __restrict v, const char *fmt, ...)
 {
 	int ret = 0;
 	va_list lst;