--- libaitrpc/src/srv.c	2011/11/03 13:35:39	1.5.2.8
+++ libaitrpc/src/srv.c	2011/11/03 14:57:56	1.5.2.10
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.5.2.8 2011/11/03 13:35:39 misho Exp $
+* $Id: srv.c,v 1.5.2.10 2011/11/03 14:57:56 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -117,7 +117,7 @@ rpc_srv_dispatchCall(void *arg)
 
 		/* RPC is OK! Go decapsulate variables ... */
 		if (ntohs(rpc->call_argc)) {
-			arr = io_buffer2vals(buf + Limit, s->srv_netbuf - Limit, 
+			arr = io_buffer2vars(buf + Limit, s->srv_netbuf - Limit, 
 					ntohs(rpc->call_argc), 1);
 			if (!arr) {
 				ret = -5;
@@ -160,7 +160,7 @@ makeReply:
 
 		if (argc && arr) {
 			/* Go Encapsulate variables ... */
-			if ((i = io_vals2buffer(buf + Limit, s->srv_netbuf - Limit, arr)) == -1) {
+			if ((i = io_vars2buffer(buf + Limit, s->srv_netbuf - Limit, arr)) == -1) {
 				rpc_srv_freeVars(f);
 				argc = 0;
 				ret = -7;
@@ -708,7 +708,7 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 	pthread_mutex_lock(&(*psrv)->srv_mtx);
 	while ((f = (*psrv)->srv_funcs)) {
 		(*psrv)->srv_funcs = f->func_next;
-		rpc_srv_destroyVars(f);
+		io_freeVars(&f->func_vars);
 		free(f);
 	}
 	pthread_mutex_unlock(&(*psrv)->srv_mtx);