--- libaitrpc/src/lists.c	2012/05/15 22:47:10	1.9.2.1
+++ libaitrpc/src/lists.c	2012/05/16 08:10:39	1.9.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: lists.c,v 1.9.2.1 2012/05/15 22:47:10 misho Exp $
+* $Id: lists.c,v 1.9.2.3 2012/05/16 08:10:39 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -158,17 +158,16 @@ rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t t
 inline rpc_blob_t *
 rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t var)
 {
-	rpc_blob_t *b;
+	rpc_blob_t *b, *tmp;
 
 	if (!srv) {
 		rpc_SetErr(EINVAL, "Invalid parameter can`t get BLOB variable");
 		return NULL;
 	}
 
-	for (b = srv->srv_blob.blobs; b; b = b->blob_next) {
+	TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp)
 		if (b->blob_var == var)
 			break;
-	}
 
 	return b;
 }
@@ -191,11 +190,8 @@ rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_
 	}
 
 	blob = rpc_srv_blobCreate(srv, len);
-	if (blob) {
-		blob->blob_next = srv->srv_blob.blobs;
-		srv->srv_blob.blobs = blob;
-	}
 
+	TAILQ_INSERT_TAIL(&srv->srv_blob.blobs, blob, blob_node);
 	return blob;
 }
 
@@ -209,7 +205,7 @@ rpc_srv_registerBLOB(rpc_srv_t * __restrict srv, size_
 int
 rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uint32_t var)
 {
-	rpc_blob_t *b, *curr;
+	rpc_blob_t *b;
 
 	if (!srv) {
 		rpc_SetErr(EINVAL, "Invalid parameter can`t unregister BLOB variable");
@@ -219,18 +215,10 @@ 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);
 
-	if (srv->srv_blob.blobs == b) {	/* if is 1st element */
-		srv->srv_blob.blobs = srv->srv_blob.blobs->blob_next;
-	} else {
-		for (curr = srv->srv_blob.blobs; curr->blob_next != b; curr = curr->blob_next);
-		curr->blob_next = curr->blob_next->blob_next;
-	}
+	TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node);
+
 	rpc_srv_blobFree(srv, b);
 	free(b);
-
 	return 1;
 }