--- libaitrpc/src/blob.c	2012/05/19 00:29:51	1.8
+++ libaitrpc/src/blob.c	2013/03/07 23:10:50	1.11
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: blob.c,v 1.8 2012/05/19 00:29:51 misho Exp $
+* $Id: blob.c,v 1.11 2013/03/07 23:10:50 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@ again:
 	rnd = random() % UINT_MAX;
 
 	memset(szFName, 0, sizeof szFName);
-	snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STR(&srv->srv_blob.dir), rnd);
+	snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STRZ(&srv->srv_blob.dir), rnd);
 	f = open(szFName, O_CREAT | O_EXCL | O_RDWR, 0600);
 	if (f == -1) {
 		if (errno == EEXIST)
@@ -81,7 +81,7 @@ again:
 		return NULL;
 	}
 
-	blob = malloc(sizeof(rpc_blob_t));
+	blob = e_malloc(sizeof(rpc_blob_t));
 	if (!blob) {
 		LOGERR;
 		close(f);
@@ -92,7 +92,7 @@ again:
 	blob->blob_data = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, f, 0);
 	if (blob->blob_data == MAP_FAILED) {
 		LOGERR;
-		free(blob);
+		e_free(blob);
 		close(f);
 		unlink(szFName);
 		return NULL;
@@ -127,7 +127,7 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t
 	}
 
 	memset(szFName, 0, sizeof szFName);
-	snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STR(&srv->srv_blob.dir), blob->blob_var);
+	snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STRZ(&srv->srv_blob.dir), blob->blob_var);
 	f = open(szFName, O_RDWR);
 	if (f == -1) {
 		LOGERR;
@@ -183,7 +183,7 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_
 		rpc_srv_blobUnmap(blob);
 
 	memset(szFName, 0, sizeof szFName);
-	snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STR(&srv->srv_blob.dir), blob->blob_var);
+	snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STRZ(&srv->srv_blob.dir), blob->blob_var);
 	if (unlink(szFName) == -1) {
 		LOGERR;
 		return -1;
@@ -356,7 +356,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
  *
  * @cli = Client instance
  * @var = BLOB variable
- * @data = BLOB data, must be free after use!
+ * @data = BLOB data, must be e_free after use!
  * return: -1 error, 0 ok, 1 remote error
  */
 int
@@ -372,7 +372,7 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
 		return -1;
 	}
 
-	*data = malloc(AIT_LEN(var));
+	*data = e_malloc(AIT_LEN(var));
 	if (!*data) {
 		LOGERR;
 		return -1;
@@ -396,13 +396,13 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || 
 			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 		LOGERR;
-		free(*data);
+		e_free(*data);
 		*data = NULL;
 		return -1;
 	}
 	if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
 		LOGERR;
-		free(*data);
+		e_free(*data);
 		*data = NULL;
 		return -1;
 	}
@@ -413,14 +413,14 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
 		if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
 				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 			LOGERR;
-			free(*data);
+			e_free(*data);
 			*data = NULL;
 			return -1;
 		}
 
 		if ((len = recv(cli->cli_sock, pos, ret, 0)) == -1) {
 			LOGERR;
-			free(*data);
+			e_free(*data);
 			*data = NULL;
 			return -1;
 		}
@@ -433,13 +433,13 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
 			LOGERR;
 		else
 			rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond");
-		free(*data);
+		e_free(*data);
 		*data = NULL;
 		return 1;
 	}
 	if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
 		LOGERR;
-		free(*data);
+		e_free(*data);
 		*data = NULL;
 		return 1;
 	}
@@ -448,14 +448,14 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	hdr.hdr_crc ^= hdr.hdr_crc;
 	if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) {
 		rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet");
-		free(*data);
+		e_free(*data);
 		*data = NULL;
 		return 1;
 	}
 	if (hdr.hdr_cmd != error) {
 		if (ntohl(hdr.hdr_len) != AIT_LEN(var)) {
 			rpc_SetErr(ECANCELED, "Bad return length packet");
-			free(*data);
+			e_free(*data);
 			*data = NULL;
 			return 1;
 		}
@@ -536,7 +536,7 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t 
  *
  * @cli = Client instance
  * @var = BLOB variable
- * @data = BLOB data, must be free after use!
+ * @data = BLOB data, must be e_free after use!
  * return: -1 error, 0 ok, 1 remote error
  */
 inline int