--- libaitrpc/src/lists.c	2011/09/01 11:39:26	1.4.2.3
+++ libaitrpc/src/lists.c	2011/11/03 13:35:39	1.5.2.1
@@ -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.1 2011/11/03 13:35:39 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -47,10 +47,9 @@ 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
@@ -100,7 +99,7 @@ rpc_srv_destroyVars(rpc_func_t * __restrict call)
 	}
 
 	if (call->func_vars) {
-		rpc_srv_freeVals(call);
+		rpc_srv_freeVars(call);
 
 		io_arrayFree(call->func_vars);
 		io_arrayDestroy(&call->func_vars);
@@ -110,12 +109,12 @@ rpc_srv_destroyVars(rpc_func_t * __restrict call)
 }
 
 /*
- * rpc_srv_freeVals() Clean values from variables of array
+ * rpc_srv_freeVars() 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;
 
@@ -254,25 +253,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);
 	}
+	rpc_srv_destroyVars(f);
+	free(f);
 	pthread_mutex_unlock(&srv->srv_mtx);
 
 	return 1;
@@ -353,12 +346,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 +400,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 +411,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;
 }