--- libaitrpc/src/lists.c	2011/09/03 13:18:26	1.4.2.6
+++ libaitrpc/src/lists.c	2011/09/07 01:19:19	1.4.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: lists.c,v 1.4.2.6 2011/09/03 13:18:26 misho Exp $
+* $Id: lists.c,v 1.4.2.8 2011/09/07 01:19:19 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -221,7 +221,6 @@ 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;
 }
 
@@ -260,21 +259,14 @@ rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con
 	if (!f)				/* not found element for unregister */
 		return 0;
 
-	printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>func(%s)=%p\n", f->func_name, f);
-	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;
-
-		rpc_srv_destroyVars(f);
-		free(f);
-		f = NULL;
-	} else {
+	else {
 		for (curr = srv->srv_funcs; curr->func_next != f; curr = curr->func_next);
 		curr->func_next = curr->func_next->func_next;
-
-		rpc_srv_destroyVars(f);
-		free(f);
-		f = NULL;
 	}
+	rpc_srv_destroyVars(f);
+	free(f);
 	pthread_mutex_unlock(&srv->srv_mtx);
 
 	return 1;
@@ -420,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;
 }