--- libaitrpc/src/cli.c	2010/06/18 01:48:06	1.1.1.1
+++ libaitrpc/src/cli.c	2010/06/23 07:50:01	1.1.1.1.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.1.1.1 2010/06/18 01:48:06 misho Exp $
+* $Id: cli.c,v 1.1.1.1.2.3 2010/06/23 07:50:01 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -144,7 +144,7 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 	int ret = 0, Limit = 0;
 	register int i;
 	rpc_val_t *v;
-	struct timeval tv = { DEF_CLI_TIMEOUT, 0 };
+	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
 
 	FD_ZERO(&fds);
 	memset(buf, 0, BUFSIZ);
@@ -192,14 +192,14 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 					data += in_vals[i].val_len;
 					Limit += in_vals[i].val_len;
 					break;
-				case array:
+				case blob:
 					if (Limit + in_vals[i].val_len > BUFSIZ) {
 						ret = -7;
 						break;
 					}
 
-					memcpy(data, in_vals[i].val.array, in_vals[i].val_len);
-					v[i].val.array = (int8_t**) ((void*) data - (void*) v);
+					memcpy(data, in_vals[i].val.blob, in_vals[i].val_len);
+					v[i].val.blob = (int8_t**) ((void*) data - (void*) v);
 					data += in_vals[i].val_len;
 					Limit += in_vals[i].val_len;
 					break;
@@ -289,24 +289,26 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 					}
 				       	data += (*out_vals)[i].val_len + 1;
 					break;
-				case array:
-					(*out_vals)[i].val.array = malloc((*out_vals)[i].val_len);
-					if (!(*out_vals)[i].val.array) {
+				case blob:
+					(*out_vals)[i].val.blob = malloc((*out_vals)[i].val_len);
+					if (!(*out_vals)[i].val.blob) {
 						rpc_SetErr(errno, "Error:: in prepare RPC reply ...\n");
 						free(*out_vals);
 						*out_vals = NULL;
 						*out_argc = 0;
 						return -1;
 					} else
-						memcpy((*out_vals)[i].val.array, data, (*out_vals)[i].val_len);
+						memcpy((*out_vals)[i].val.blob, data, (*out_vals)[i].val_len);
 				       	data += (*out_vals)[i].val_len;
 					break;
 				default:
 					break;
 			}
 	} else {
-		*out_argc = 0;
-		*out_vals = NULL;
+		if (out_argc)
+			*out_argc = 0;
+		if (out_vals)
+			*out_vals = NULL;
 	}
 
 	return rrpc->ret_retcode;