--- libaitrpc/inc/aitrpc.h	2010/06/18 13:36:01	1.1.1.1.2.1
+++ libaitrpc/inc/aitrpc.h	2010/06/23 07:18:18	1.1.1.1.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.1.1.1.2.1 2010/06/18 13:36:01 misho Exp $
+* $Id: aitrpc.h,v 1.1.1.1.2.2 2010/06/23 07:18:18 misho Exp $
 *
 *************************************************************************/
 #ifndef __AITRPC_H
@@ -71,6 +71,7 @@ typedef struct {
 
 #define RPC_TYPE_VAL(vl)		((vl)->val_type)
 #define RPC_LEN_VAL(vl)			((vl)->val_len)
+#define RPC_NUM_ARRAY(vl)		((vl)->val_len / sizeof(int8_t*))
 #define RPC_EMPTY_VAL(vl)		((vl)->val_type == empty)
 
 #define RPC_GET_BUF(vl)			(assert((vl)->val_type == buffer), (vl)->val.buffer)
@@ -99,9 +100,10 @@ typedef struct {
 						if (val->val.string) { \
 							val->val_type = string; val->val_len = strlen(v) + 1; \
 						} } while (0)
-#define RPC_SET_ARRAY(vl, v, n, l)	do { rpc_val_t *val = (vl); assert(val); val->val.array = calloc(n, l); \
+#define RPC_SET_ARRAY(vl, v, l)		do { rpc_val_t *val = (vl); assert(val); \
+						val->val.array = malloc(sizeof(int8_t*) * l); \
 						if (val->val.array) { \
-							val->val_type = array; val->val_len = n * l; \
+							val->val_type = array; val->val_len = sizeof(int8_t*) * l; \
 							memcpy(val->val.array, v, val->val_len); \
 						} } while (0)
 #define RPC_SET_SIZE(vl, v)		do { rpc_val_t *val = (vl); assert(val); val->val_type = size; val->val.size = v; \
@@ -148,7 +150,7 @@ typedef struct {
 					} while (0)
 
 
-#define RPC_CALLBACK_CHECK_ARGS(f, n)	do { \
+#define RPC_CALLBACK_CHK_NUM_ARGS(f, n)	do { \
 						if (f->func_args != n) { \
 							rpc_SetErr(22, "Error:: different number of arguments!\n"); \
 							return -1; \