--- libaitio/src/Attic/vars.c	2012/05/23 14:06:08	1.8.2.3
+++ libaitio/src/Attic/vars.c	2012/05/19 00:11:58	1.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: vars.c,v 1.8.2.3 2012/05/23 14:06:08 misho Exp $
+* $Id: vars.c,v 1.9 2012/05/19 00:11:58 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -179,7 +179,7 @@ io_buffer2vars(u_char *buf, int buflen, int vnum, int 
 	/* de-marshaling */
 	for (i = 0; i < io_arraySize(vars); i++) {
 		if (!zcpy) {
-			val = io_malloc(sizeof(ait_val_t));
+			val = malloc(sizeof(ait_val_t));
 			if (!val) {
 				LOGERR;
 				io_arrayFree(vars);
@@ -233,7 +233,7 @@ io_buffer2vars(u_char *buf, int buflen, int vnum, int 
 					Limit += AIT_LEN(val);
 
 				if (!zcpy) {
-					val->val.buffer = io_malloc(AIT_LEN(val));
+					val->val.buffer = malloc(AIT_LEN(val));
 					if (!val->val.buffer) {
 						LOGERR;
 						io_arrayFree(vars);
@@ -393,7 +393,7 @@ io_map2vars(u_char *buf, int buflen, int vnum, int zcp
 	/* de-marshaling */
 	for (i = 0; i < io_arraySize(vars); i++) {
 		if (!zcpy) {
-			val = io_malloc(sizeof(ait_val_t));
+			val = malloc(sizeof(ait_val_t));
 			if (!val) {
 				LOGERR;
 				io_arrayFree(vars);
@@ -438,7 +438,7 @@ io_map2vars(u_char *buf, int buflen, int vnum, int zcp
 					Limit += AIT_LEN(val);
 
 				if (!zcpy) {
-					val->val.buffer = io_malloc(AIT_LEN(val));
+					val->val.buffer = malloc(AIT_LEN(val));
 					if (!val->val.buffer) {
 						LOGERR;
 						io_arrayFree(vars);
@@ -576,7 +576,7 @@ io_allocVar(void)
 {
 	ait_val_t *v = NULL;
 
-	v = io_malloc(sizeof(ait_val_t));
+	v = malloc(sizeof(ait_val_t));
 	if (!v) {
 		LOGERR;
 		return NULL;
@@ -598,7 +598,7 @@ io_freeVar(ait_val_t ** __restrict val)
 {
 	if (val && *val) {
 		AIT_FREE_VAL(*val);
-		io_free(*val);
+		free(*val);
 		*val = NULL;
 	}
 }