--- libaitrpc/src/lists.c	2011/08/31 17:11:58	1.4.2.2
+++ libaitrpc/src/lists.c	2011/09/03 13:18:26	1.4.2.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: lists.c,v 1.4.2.2 2011/08/31 17:11:58 misho Exp $
+* $Id: lists.c,v 1.4.2.6 2011/09/03 13:18:26 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -47,26 +47,6 @@ SUCH DAMAGE.
 
 
 /*
- * rpc_srv_returnVars() Init return variables for RPC call and zeroed values
-					(for safe handling return values, use this!)
- * @call = RPC function call
- * @varnum = Number of return variables
- * return: NULL error, !=NULL array with return values for RPC call with varnum items
- */
-inline array_t *
-rpc_srv_returnVars(rpc_func_t * __restrict call, int varnum)
-{
-	array_t *v = NULL;
-
-	if (rpc_srv_allocVars(call, varnum) == -1)
-		return NULL;
-	if (rpc_srv_getVars(call, &v) == -1)
-		return NULL;
-
-	return v;
-}
-
-/*
  * rpc_srv_allocVars() Allocate array for call variables, 
 				if already allocated memory for RPC call reallocate used space
  * @call = RPC function call
@@ -84,50 +64,72 @@ rpc_srv_allocVars(rpc_func_t * __restrict call, int va
 		return -1;
 	}
 
-	if (call->func_vars)
-		for (i = 0; i < io_arraySize(call->func_vars); i++)
-			if (io_arrayGet(call->func_vars, i))
-				AIT_FREE_VAL(io_array(call->func_vars, i, ait_val_t*));
-	io_arrayFree(call->func_vars);
-	io_arrayDestroy(&call->func_vars);
-
 	if (varnum) {
-		if (!(call->func_vars = io_arrayInit(varnum)))
+		call->func_vars = io_arrayInit(varnum);
+		if (!call->func_vars)
 			return -1;
 
+		/* allocate ait_val_t elements & add to array */
 		for (i = 0; i < io_arraySize(call->func_vars); i++) {
 			v = malloc(sizeof(ait_val_t));
 			if (!v) {
 				LOGERR;
-				rpc_srv_freeVars(call);
+				rpc_srv_destroyVars(call);
 				return -1;
 			} else {
 				memset(v, 0, sizeof(ait_val_t));
 				io_arraySet(call->func_vars, i, v);
 			}
 		}
+	}
 
-		varnum = io_arraySize(call->func_vars);
+	return io_arraySize(call->func_vars);
+}
+
+/*
+ * rpc_srv_destroyVars() Destroy variables of array & array
+ * @call = RPC function call
+ * return: -1 error, !=-1 Returne remained variables
+ */
+inline int
+rpc_srv_destroyVars(rpc_func_t * __restrict call)
+{
+	if (!call) {
+		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete variables ...\n");
+		return -1;
 	}
 
-	return varnum;
+	if (call->func_vars) {
+		rpc_srv_freeVals(call);
+
+		io_arrayFree(call->func_vars);
+		io_arrayDestroy(&call->func_vars);
+	}
+
+	return io_arraySize(call->func_vars);
 }
 
 /*
- * rpc_srv_zeroVars() Clean values from variables of RPC call
+ * rpc_srv_freeVals() Clean values from variables of array
  * @call = RPC function call
- * return: -1 error, !=-1 Returned number of cleaned RPC variables
+ * return: -1 error, !=-1 Returned number of cleaned variables
  */
 inline int
-rpc_srv_zeroVars(rpc_func_t * __restrict call)
+rpc_srv_freeVals(rpc_func_t * __restrict call)
 {
+	register int i;
+
 	if (!call) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete variables ...\n");
 		return -1;
 	}
 
-	io_arrayFree(call->func_vars);
-	io_arrayZero(call->func_vars);
+	if (call->func_vars) {
+		for (i = 0; i < io_arraySize(call->func_vars); i++)
+			if (io_arrayGet(call->func_vars, i))
+				AIT_FREE_VAL(io_array(call->func_vars, i, ait_val_t*));
+	}
+
 	return io_arraySize(call->func_vars);
 }
 
@@ -167,7 +169,7 @@ rpc_srv_getVars(rpc_func_t * __restrict call, array_t 
 
 	if (vars)
 		*vars = call->func_vars;
-	return (call->func_vars ? io_arraySize(call->func_vars) : 0);
+	return io_arraySize(call->func_vars);
 }
 
 // ---------------------------------------------------------
@@ -219,6 +221,7 @@ rpc_srv_registerCall(rpc_srv_t * __restrict srv, const
 	func->func_next = srv->srv_funcs;
 	srv->srv_funcs = func;
 	pthread_mutex_unlock(&srv->srv_mtx);
+	printf("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<func(%s)=%p\n", func->func_name, func);
 	return 0;
 }
 
@@ -252,24 +255,25 @@ rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con
 	func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2);
 	func.func_hash = hash_fnv((char*) str, sizeof str);
 
+	pthread_mutex_lock(&srv->srv_mtx);
 	f = rpc_srv_getCall(srv, func.func_tag, func.func_hash);
 	if (!f)				/* not found element for unregister */
 		return 0;
 
-	pthread_mutex_lock(&srv->srv_mtx);
+	printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>func(%s)=%p\n", f->func_name, f);
 	if (srv->srv_funcs == f) {	/* if is 1st element */
 		srv->srv_funcs = srv->srv_funcs->func_next;
 
-		if (f->func_args && f->func_vars)
-			free(f->func_vars);
+		rpc_srv_destroyVars(f);
 		free(f);
+		f = NULL;
 	} else {
 		for (curr = srv->srv_funcs; curr->func_next != f; curr = curr->func_next);
 		curr->func_next = curr->func_next->func_next;
 
-		if (f->func_args && f->func_vars)
-			free(f->func_vars);
+		rpc_srv_destroyVars(f);
 		free(f);
+		f = NULL;
 	}
 	pthread_mutex_unlock(&srv->srv_mtx);
 
@@ -351,12 +355,10 @@ rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t v
 		return NULL;
 	}
 
-	pthread_mutex_lock(&srv->srv_blob.mtx);
 	for (b = srv->srv_blob.blobs; b; b = b->blob_next) {
 		if (b->blob_var == var)
 			break;
 	}
-	pthread_mutex_unlock(&srv->srv_blob.mtx);
 
 	return b;
 }
@@ -407,6 +409,9 @@ rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin
 	b = rpc_srv_getBLOB(srv, var);
 	if (!b)				/* not found element for unregister */
 		return 0;
+	/* if BLOB is unmapped force to unmap object */
+	if (b->blob_data)
+		rpc_srv_blobUnmap(b);
 
 	pthread_mutex_lock(&srv->srv_blob.mtx);
 	if (srv->srv_blob.blobs == b) {	/* if is 1st element */