--- libaitrpc/src/cli.c	2011/08/29 22:37:06	1.4
+++ libaitrpc/src/cli.c	2011/08/29 23:26:56	1.4.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.4 2011/08/29 22:37:06 misho Exp $
+* $Id: cli.c,v 1.4.2.1 2011/08/29 23:26:56 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -271,7 +271,7 @@ rpc_cli_closeClient(rpc_cli_t * __restrict cli)
  */
 int
 rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, const char *csFunc, int in_argc, 
-		rpc_val_t * __restrict in_vars, int *out_argc, rpc_val_t ** __restrict out_vars)
+		ait_val_t * __restrict in_vars, int *out_argc, ait_val_t ** __restrict out_vars)
 {
 	fd_set fds;
 	u_char buf[BUFSIZ], str[MAXPATHLEN + UCHAR_MAX + 1], *data;
@@ -279,7 +279,7 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 	struct tagRPCRet *rrpc = NULL;
 	int ret = 0, Limit = 0;
 	register int i;
-	rpc_val_t *v;
+	ait_val_t *v;
 	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
 
 	FD_ZERO(&fds);
@@ -302,14 +302,14 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 	rpc->call_hash = hash_fnv((char*) str, sizeof str);
 	Limit = sizeof(struct tagRPCCall);
 	if (in_argc) {
-		v = (rpc_val_t*) (buf + sizeof(struct tagRPCCall));
-		if (in_argc * sizeof(rpc_val_t) > sizeof buf - Limit) {
+		v = (ait_val_t*) (buf + sizeof(struct tagRPCCall));
+		if (in_argc * sizeof(ait_val_t) > sizeof buf - Limit) {
 			rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet values (-7) ...\n");
 			return -7;
 		} else
-			Limit += in_argc * sizeof(rpc_val_t);
-		memcpy(v, in_vars, in_argc * sizeof(rpc_val_t));
-		data = (u_char*) v + in_argc * sizeof(rpc_val_t);
+			Limit += in_argc * sizeof(ait_val_t);
+		memcpy(v, in_vars, in_argc * sizeof(ait_val_t));
+		data = (u_char*) v + in_argc * sizeof(ait_val_t);
 		for (i = 0; i < in_argc && !ret; i++) {
 			switch (in_vars[i].val_type) {
 				case buffer:
@@ -386,15 +386,15 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 				rrpc->ret_retcode, strerror(rrpc->ret_errno));
 		return -6;
 	}
-	if (rrpc->ret_argc * sizeof(rpc_val_t) > sizeof buf - Limit) {
+	if (rrpc->ret_argc * sizeof(ait_val_t) > sizeof buf - Limit) {
 		rpc_SetErr(EMSGSIZE, "Error:: reply RPC packet is too long ...\n");
 		return -7;
 	} else
-		Limit += rrpc->ret_argc * sizeof(rpc_val_t);
+		Limit += rrpc->ret_argc * sizeof(ait_val_t);
 	/* RPC is OK! Go decapsulate variables ... */
 	if (rrpc->ret_argc) {
 		*out_argc = rrpc->ret_argc;
-		*out_vars = calloc(rrpc->ret_argc, sizeof(rpc_val_t));
+		*out_vars = calloc(rrpc->ret_argc, sizeof(ait_val_t));
 		if (!*out_vars) {
 			LOGERR;
 			*out_argc = 0;
@@ -461,13 +461,13 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 }
 
 /*
- * rpc_cli_freeVals() Free rpc_val_t array returned from RPC call
+ * rpc_cli_freeVals() Free ait_val_t array returned from RPC call
  * @args = Number of arguments in array
  * @vars = Value elements
  * return: none
  */
 inline void
-rpc_cli_freeVals(int args, rpc_val_t *vars)
+rpc_cli_freeVals(int args, ait_val_t * __restrict vars)
 {
 	register int i;
 
@@ -475,7 +475,7 @@ rpc_cli_freeVals(int args, rpc_val_t *vars)
 		return;
 
 	for (i = 0; i < args; i++)
-		RPC_FREE_VAL(&vars[i]);
+		AIT_FREE_VAL(&vars[i]);
 
 	free(vars);
 	vars = NULL;