--- libaitrpc/inc/aitrpc.h	2011/08/19 07:39:29	1.2.4.5
+++ libaitrpc/inc/aitrpc.h	2011/08/19 08:24:13	1.2.4.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.2.4.5 2011/08/19 07:39:29 misho Exp $
+* $Id: aitrpc.h,v 1.2.4.6 2011/08/19 08:24:13 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -226,7 +226,7 @@ typedef struct tagRPCFunc {
 	int8_t			func_name[UCHAR_MAX + 1];
 
 	int8_t			func_args;
-	rpc_val_t		*func_vals;
+	rpc_val_t		*func_vars;
 
 	void			*func_parent;
 	struct tagRPCFunc	*func_next;
@@ -427,48 +427,42 @@ int rpc_srv_execCall(rpc_func_t * __restrict call, str
 
 
 /*
- * rpc_srv_retValsCall() Declare return variables for RPC call and zeroed values
+ * rpc_srv_returnVars() Init return variables for RPC call and zeroed values
 					(for safe handling return values, use this!)
  * @call = RPC function call
- * @return_vals = Number of return variables
- * return: NULL error, !=NULL array with return values for RPC call with return_vals items
+ * @varnum = Number of return variables
+ * return: NULL error, !=NULL array with return values for RPC call with varnum items
  */
-inline rpc_val_t *rpc_srv_retValsCall(rpc_func_t * __restrict call, int return_vals);
+inline rpc_val_t *rpc_srv_returnVars(rpc_func_t * __restrict call, int varnum);
 /*
- * rpc_srv_declValsCall() Declare return variables for RPC call, 
-				if already allocated memory for RPC call return values 
-				function reallocate used space with return_vals count elements
+ * rpc_srv_allocVars() Allocate array for call variables, 
+				if already allocated memory for RPC call reallocate used space
  * @call = RPC function call
- * @return_vals = Number of return variables
- * return: -1 error, !=-1 ok
+ * @varnum = Number of variables, if ==0 free previous allocated variables
+ * return: -1 error, !=-1 return varnum value
  */
-inline int rpc_srv_declValsCall(rpc_func_t * __restrict call, int return_vals);
+inline int rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum);
+#define rpc_srv_freeVars(_call)	(assert((_call)), rpc_srv_allocVars((_call), 0))
 /*
- * rpc_srv_freeValsCall() Free return variables for RPC call
+ * rpc_srv_zeroVars() Clean values from variables of RPC call
  * @call = RPC function call
- * return: none
+ * return: -1 error, !=-1 Returned number of cleaned RPC variables
  */
-inline void rpc_srv_freeValsCall(rpc_func_t * __restrict call);
+inline int rpc_srv_zeroVars(rpc_func_t * __restrict call);
 /*
- * rpc_srv_copyValsCall() Copy return variables for RPC call to new variable
+ * rpc_srv_copyVars() Copy variables for RPC call to new variable array
  * @call = RPC function call
- * @newvals = New allocated variables array, must be free after use
+ * @newvars = New allocated variables array, must be free after use
  * return: -1 error, !=-1 Returned number of copied RPC variables
  */
-inline int rpc_srv_copyValsCall(rpc_func_t * __restrict call, rpc_val_t ** __restrict newvals);
+inline int rpc_srv_copyVars(rpc_func_t * __restrict call, rpc_val_t ** __restrict newvars);
 /*
- * rpc_srv_zeroValsCall() Clean values from return variables of RPC call
+ * rpc_srv_getVars() Get variables array for RPC call
  * @call = RPC function call
- * return: -1 error, !=-1 Returned number of cleaned RPC variables
- */
-inline int rpc_srv_zeroValsCall(rpc_func_t * __restrict call);
-/*
- * rpc_srv_getValsCall() Get return variables for RPC call
- * @call = RPC function call
- * @vals = Returned variables, may be NULL
+ * @vars = Returned variables array, may be NULL
  * return: -1 error, !=-1 Number of returned variables
  */
-inline int rpc_srv_getValsCall(rpc_func_t * __restrict call, rpc_val_t ** __restrict vals);
+inline int rpc_srv_getVars(rpc_func_t * __restrict call, rpc_val_t ** __restrict vars);
 
 
 /*