--- libaitrpc/src/lists.c	2011/09/01 11:39:26	1.4.2.3
+++ libaitrpc/src/lists.c	2011/11/03 14:57:56	1.5.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: lists.c,v 1.4.2.3 2011/09/01 11:39:26 misho Exp $
+* $Id: lists.c,v 1.5.2.2 2011/11/03 14:57:56 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -47,90 +47,42 @@ SUCH DAMAGE.
 
 
 /*
- * rpc_srv_allocVars() Allocate array for call variables, 
-				if already allocated memory for RPC call reallocate used space
+ * rpc_srv_allocVars() Allocate array for call variables
  * @call = RPC function call
- * @varnum = Number of variables, if ==0 free previous allocated variables
+ * @varnum = Number of variables, if ==0 return already allocated variables number
  * return: -1 error, !=-1 return varnum value
  */
 inline int
 rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum)
 {
-	register int i;
-	ait_val_t *v;
-
 	if (!call || varnum < 0) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t allocate variables for RPC call...\n");
 		return -1;
 	}
 
 	if (varnum) {
-		call->func_vars = io_arrayInit(varnum);
+		call->func_vars = io_allocVars(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_destroyVars(call);
-				return -1;
-			} else {
-				memset(v, 0, sizeof(ait_val_t));
-				io_arraySet(call->func_vars, i, v);
-			}
-		}
 	}
 
 	return io_arraySize(call->func_vars);
 }
 
 /*
- * rpc_srv_destroyVars() Destroy variables of array & array
+ * rpc_srv_freeVars() Clean values from variables of 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;
-	}
-
-	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_freeVals() Clean values from variables of array
- * @call = RPC function call
  * return: -1 error, !=-1 Returned number of cleaned variables
  */
 inline int
-rpc_srv_freeVals(rpc_func_t * __restrict call)
+rpc_srv_freeVars(rpc_func_t * __restrict call)
 {
-	register int i;
-
 	if (!call) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete variables ...\n");
 		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*));
-	}
-
-	return io_arraySize(call->func_vars);
+	return io_clrVars(call->func_vars);
 }
 
 /*
@@ -254,25 +206,19 @@ 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);
-	if (srv->srv_funcs == f) {	/* if is 1st element */
+	if (srv->srv_funcs == f)	/* if is 1st element */
 		srv->srv_funcs = srv->srv_funcs->func_next;
-
-		if (f->func_vars)
-			rpc_srv_destroyVars(f);
-		free(f);
-	} else {
+	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_vars)
-			rpc_srv_destroyVars(f);
-		free(f);
 	}
+	io_freeVars(&f->func_vars);
+	free(f);
 	pthread_mutex_unlock(&srv->srv_mtx);
 
 	return 1;
@@ -353,12 +299,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;
 }
@@ -409,6 +353,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 */
@@ -417,9 +364,9 @@ rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin
 		for (curr = srv->srv_blob.blobs; curr->blob_next != b; curr = curr->blob_next);
 		curr->blob_next = curr->blob_next->blob_next;
 	}
+	pthread_mutex_unlock(&srv->srv_blob.mtx);
 	rpc_srv_blobFree(srv, b);
 	free(b);
-	pthread_mutex_unlock(&srv->srv_blob.mtx);
 
 	return 1;
 }