--- libaitrpc/src/lists.c 2011/08/29 22:37:06 1.4 +++ libaitrpc/src/lists.c 2011/08/29 23:26:56 1.4.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: lists.c,v 1.4 2011/08/29 22:37:06 misho Exp $ +* $Id: lists.c,v 1.4.2.1 2011/08/29 23:26:56 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -53,10 +53,10 @@ SUCH DAMAGE. * @varnum = Number of return variables * return: NULL error, !=NULL array with return values for RPC call with varnum items */ -inline rpc_val_t * +inline ait_val_t * rpc_srv_returnVars(rpc_func_t * __restrict call, int varnum) { - rpc_val_t *v = NULL; + ait_val_t *v = NULL; if (rpc_srv_allocVars(call, varnum) == -1) return NULL; @@ -92,7 +92,7 @@ rpc_srv_allocVars(rpc_func_t * __restrict call, int va call->func_vars = NULL; } } else { - ptr = realloc(call->func_vars, varnum * sizeof(rpc_val_t)); + ptr = realloc(call->func_vars, varnum * sizeof(ait_val_t)); if (!ptr) { LOGERR; call->func_args = 0; @@ -117,7 +117,7 @@ rpc_srv_zeroVars(rpc_func_t * __restrict call) return -1; } - memset(call->func_vars, 0, call->func_args * sizeof(rpc_val_t)); + memset(call->func_vars, 0, call->func_args * sizeof(ait_val_t)); return call->func_args; } @@ -128,19 +128,19 @@ rpc_srv_zeroVars(rpc_func_t * __restrict call) * return: -1 error, !=-1 Returned number of copied RPC variables */ inline int -rpc_srv_copyVars(rpc_func_t * __restrict call, rpc_val_t ** __restrict newvars) +rpc_srv_copyVars(rpc_func_t * __restrict call, ait_val_t ** __restrict newvars) { if (!call || !newvars) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t copy variables to new array\n"); return -1; } - *newvars = calloc(call->func_args, sizeof(rpc_val_t)); + *newvars = calloc(call->func_args, sizeof(ait_val_t)); if (!*newvars) { LOGERR; return -1; } else - memcpy(*newvars, call->func_vars, call->func_args * sizeof(rpc_val_t)); + memcpy(*newvars, call->func_vars, call->func_args * sizeof(ait_val_t)); return call->func_args; } @@ -152,7 +152,7 @@ rpc_srv_copyVars(rpc_func_t * __restrict call, rpc_val * return: -1 error, !=-1 Number of returned variables */ inline int -rpc_srv_getVars(rpc_func_t * __restrict call, rpc_val_t ** __restrict vars) +rpc_srv_getVars(rpc_func_t * __restrict call, ait_val_t ** __restrict vars) { if (!call) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get variables ...\n");