--- libaitrpc/src/lists.c	2011/08/29 22:37:06	1.4
+++ libaitrpc/src/lists.c	2011/09/07 07:24:21	1.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: lists.c,v 1.4 2011/08/29 22:37:06 misho Exp $
+* $Id: lists.c,v 1.5 2011/09/07 07:24:21 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -47,28 +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 rpc_val_t *
-rpc_srv_returnVars(rpc_func_t * __restrict call, int varnum)
-{
-	rpc_val_t *v = NULL;
-
-	if (rpc_srv_allocVars(call, varnum) == -1)
-		return NULL;
-	else
-		rpc_srv_zeroVars(call);
-	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
@@ -78,71 +56,101 @@ rpc_srv_returnVars(rpc_func_t * __restrict call, int v
 inline int
 rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum)
 {
-	void *ptr;
+	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;
-	} else
-		call->func_args = varnum;
+	}
 
-	if (!varnum) {
-		if (call->func_vars) {
-			free(call->func_vars);
-			call->func_vars = NULL;
-		}
-	} else {
-		ptr = realloc(call->func_vars, varnum * sizeof(rpc_val_t));
-		if (!ptr) {
-			LOGERR;
-			call->func_args = 0;
+	if (varnum) {
+		call->func_vars = io_arrayInit(varnum);
+		if (!call->func_vars)
 			return -1;
-		} else
-			call->func_vars = ptr;
+
+		/* 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 varnum;
+	return io_arraySize(call->func_vars);
 }
 
 /*
- * rpc_srv_zeroVars() Clean values from variables of RPC call
+ * rpc_srv_destroyVars() Destroy variables of array & array
  * @call = RPC function call
- * return: -1 error, !=-1 Returned number of cleaned RPC variables
+ * return: -1 error, !=-1 Returne remained variables
  */
 inline int
-rpc_srv_zeroVars(rpc_func_t * __restrict call)
+rpc_srv_destroyVars(rpc_func_t * __restrict call)
 {
 	if (!call) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t delete variables ...\n");
 		return -1;
 	}
 
-	memset(call->func_vars, 0, call->func_args * sizeof(rpc_val_t));
-	return call->func_args;
+	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)
+{
+	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);
+}
+
+/*
  * rpc_srv_copyVars() Copy variables for RPC call to new variable array
  * @call = RPC function call
  * @newvars = New allocated variables array, must be free after use
  * 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, array_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));
-	if (!*newvars) {
-		LOGERR;
+	if (io_arrayCopy(newvars, call->func_vars) == -1)
 		return -1;
-	} else
-		memcpy(*newvars, call->func_vars, call->func_args * sizeof(rpc_val_t));
 
-	return call->func_args;
+	return io_arraySize(*newvars);
 }
 
 /*
@@ -152,7 +160,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, array_t ** __restrict vars)
 {
 	if (!call) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t get variables ...\n");
@@ -161,7 +169,7 @@ rpc_srv_getVars(rpc_func_t * __restrict call, rpc_val_
 
 	if (vars)
 		*vars = call->func_vars;
-	return call->func_args;
+	return io_arraySize(call->func_vars);
 }
 
 // ---------------------------------------------------------
@@ -175,7 +183,7 @@ rpc_srv_getVars(rpc_func_t * __restrict call, rpc_val_
  * return: -1 error or 0 register ok
  */
 int
-rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc, u_char args)
+rpc_srv_registerCall(rpc_srv_t * __restrict srv, const char *csModule, const char *csFunc, u_short args)
 {
 	rpc_func_t *func;
 	u_char str[MAXPATHLEN + UCHAR_MAX + 1];
@@ -246,25 +254,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_args && f->func_vars)
-			free(f->func_vars);
-		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_args && f->func_vars)
-			free(f->func_vars);
-		free(f);
 	}
+	rpc_srv_destroyVars(f);
+	free(f);
 	pthread_mutex_unlock(&srv->srv_mtx);
 
 	return 1;
@@ -345,12 +347,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;
 }
@@ -401,6 +401,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 */
@@ -409,9 +412,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;
 }