--- libaitmqtt/src/sub.c	2012/04/26 11:49:12	1.1.1.1.2.2
+++ libaitmqtt/src/sub.c	2012/04/27 08:12:30	1.1.1.1.2.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: sub.c,v 1.1.1.1.2.2 2012/04/26 11:49:12 misho Exp $
+* $Id: sub.c,v 1.1.1.1.2.4 2012/04/27 08:12:30 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -109,7 +109,6 @@ mqtt_msgSUBSCRIBE(mqtt_msg_t * __restrict buf, mqtt_su
 	hdr->mqtt_msg.retain = 0;
 	*hdr->mqtt_len = mqtt_encodeLen(siz - sizeof(struct mqtthdr));
 
-	mqtt_msgRealloc(buf, siz);
 	return siz;
 }
 
@@ -157,7 +156,6 @@ mqtt_msgSUBACK(mqtt_msg_t * __restrict buf, mqtt_subsc
 	hdr->mqtt_msg.type = MQTT_TYPE_SUBACK;
 	*hdr->mqtt_len = mqtt_encodeLen(siz - sizeof(struct mqtthdr));
 
-	mqtt_msgRealloc(buf, siz);
 	return siz;
 }
 
@@ -220,7 +218,6 @@ mqtt_msgUNSUBSCRIBE(mqtt_msg_t * __restrict buf, mqtt_
 	hdr->mqtt_msg.retain = 0;
 	*hdr->mqtt_len = mqtt_encodeLen(siz - sizeof(struct mqtthdr));
 
-	mqtt_msgRealloc(buf, siz);
 	return siz;
 }
 
@@ -317,8 +314,7 @@ mqtt_readSUBSCRIBE(mqtt_msg_t * __restrict buf, u_shor
 			mqtt_SetErr(EINVAL, "Short message length %d", len);
 			return -1;
 		}
-		subs = mqtt_subRealloc(subs, i + 1);
-		if (!subs) {
+		if (!mqtt_subRealloc(&subs, i + 1)) {
 			mqtt_subFree(subscr);
 			return -1;
 		} else
@@ -441,8 +437,7 @@ mqtt_readUNSUBSCRIBE(mqtt_msg_t * __restrict buf, u_sh
 			mqtt_SetErr(EINVAL, "Short message length %d", len);
 			return -1;
 		}
-		subs = mqtt_subRealloc(subs, i + 1);
-		if (!subs) {
+		if (!mqtt_subRealloc(&subs, i + 1)) {
 			mqtt_subFree(subscr);
 			return -1;
 		} else