--- libaitrpc/src/lists.c	2011/09/07 07:24:21	1.5
+++ libaitrpc/src/lists.c	2011/11/03 15:32:21	1.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: lists.c,v 1.5 2011/09/07 07:24:21 misho Exp $
+* $Id: lists.c,v 1.6 2011/11/03 15:32:21 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -47,93 +47,29 @@ SUCH DAMAGE.
 
 
 /*
- * rpc_srv_allocVars() Allocate array for call variables, 
-				if already allocated memory for RPC call reallocate used space
+ * rpc_srv_allocVars() Allocate array for call variables
  * @call = RPC function call
- * @varnum = Number of variables, if ==0 free previous allocated variables
+ * @varnum = Number of variables, if ==0 return already allocated variables number
  * return: -1 error, !=-1 return varnum value
  */
-inline int
+static inline int
 rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum)
 {
-	register int i;
-	ait_val_t *v;
-
 	if (!call || varnum < 0) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t allocate variables for RPC call...\n");
 		return -1;
 	}
 
 	if (varnum) {
-		call->func_vars = io_arrayInit(varnum);
+		call->func_vars = io_allocVars(varnum);
 		if (!call->func_vars)
 			return -1;
-
-		/* allocate ait_val_t elements & add to array */
-		for (i = 0; i < io_arraySize(call->func_vars); i++) {
-			v = malloc(sizeof(ait_val_t));
-			if (!v) {
-				LOGERR;
-				rpc_srv_destroyVars(call);
-				return -1;
-			} else {
-				memset(v, 0, sizeof(ait_val_t));
-				io_arraySet(call->func_vars, i, v);
-			}
-		}
 	}
 
 	return io_arraySize(call->func_vars);
 }
 
 /*
- * rpc_srv_destroyVars() Destroy variables of array & array
- * @call = RPC function call
- * return: -1 error, !=-1 Returne remained variables
- */
-inline int
-rpc_srv_destroyVars(rpc_func_t * __restrict call)
-{
-	if (!call) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete variables ...\n");
-		return -1;
-	}
-
-	if (call->func_vars) {
-		rpc_srv_freeVals(call);
-
-		io_arrayFree(call->func_vars);
-		io_arrayDestroy(&call->func_vars);
-	}
-
-	return io_arraySize(call->func_vars);
-}
-
-/*
- * rpc_srv_freeVals() Clean values from variables of array
- * @call = RPC function call
- * return: -1 error, !=-1 Returned number of cleaned variables
- */
-inline int
-rpc_srv_freeVals(rpc_func_t * __restrict call)
-{
-	register int i;
-
-	if (!call) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete variables ...\n");
-		return -1;
-	}
-
-	if (call->func_vars) {
-		for (i = 0; i < io_arraySize(call->func_vars); i++)
-			if (io_arrayGet(call->func_vars, i))
-				AIT_FREE_VAL(io_array(call->func_vars, i, ait_val_t*));
-	}
-
-	return io_arraySize(call->func_vars);
-}
-
-/*
  * rpc_srv_copyVars() Copy variables for RPC call to new variable array
  * @call = RPC function call
  * @newvars = New allocated variables array, must be free after use
@@ -265,7 +201,7 @@ rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con
 		for (curr = srv->srv_funcs; curr->func_next != f; curr = curr->func_next);
 		curr->func_next = curr->func_next->func_next;
 	}
-	rpc_srv_destroyVars(f);
+	io_freeVars(&f->func_vars);
 	free(f);
 	pthread_mutex_unlock(&srv->srv_mtx);