--- libaitmqtt/src/pub.c	2012/04/27 15:15:12	1.1.1.1.2.3
+++ libaitmqtt/src/pub.c	2012/04/27 15:49:07	1.1.1.1.2.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: pub.c,v 1.1.1.1.2.3 2012/04/27 15:15:12 misho Exp $
+* $Id: pub.c,v 1.1.1.1.2.4 2012/04/27 15:49:07 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -208,12 +208,11 @@ mqtt_msgPUBCOMP(mqtt_msg_t * __restrict buf, u_short m
  * @topicLen = Topic length
  * @msgID = MessageID
  * @pData = Data buffer
- * @datLen = Data buffer length, if *datLen == 0 allocate memory for pData
- * return: NULL error or !=NULL MQTT data buffer
+ * return: -1 error or !=-1 allocated data buffer length
  */
-void *
+int
 mqtt_readPUBLISH(mqtt_msg_t * __restrict buf, char * __restrict psTopic, int topicLen, 
-		u_short *msgID, void * __restrict pData, int *datLen)
+		u_short *msgID, void ** __restrict pData)
 {
 	int len, ret;
 	struct mqtthdr *hdr;
@@ -221,12 +220,12 @@ mqtt_readPUBLISH(mqtt_msg_t * __restrict buf, char * _
 	mqtt_len_t *v;
 	caddr_t pos;
 
-	if (!buf || !psTopic || !msgID)
-		return NULL;
+	if (!buf || !psTopic || !msgID || !pData)
+		return -1;
 
 	hdr = _mqtt_readHEADER(buf, MQTT_TYPE_PUBLISH, &ret, &len);
 	if (!hdr)
-		return NULL;
+		return -1;
 	pos = buf->msg_base + ret + 1;
 	var = (mqtthdr_var_t*) pos;
 
@@ -234,7 +233,7 @@ mqtt_readPUBLISH(mqtt_msg_t * __restrict buf, char * _
 	len -= MQTTHDR_VAR_SIZEOF(var);
 	if (len < 0) {
 		mqtt_SetErr(EINVAL, "Short message length %d", len);
-		return NULL;
+		return -1;
 	} else {
 		memset(psTopic, 0, topicLen--);
 		memcpy(psTopic, var->var_data, ntohs(var->var_sb.val) > topicLen ? 
@@ -246,7 +245,7 @@ mqtt_readPUBLISH(mqtt_msg_t * __restrict buf, char * _
 	len -= sizeof(mqtt_len_t);
 	if (len < 0) {
 		mqtt_SetErr(EINVAL, "Short message length %d", len);
-		return NULL;
+		return -1;
 	} else {
 		*msgID = ntohs(v->val);
 		pos += sizeof(mqtt_len_t);
@@ -255,25 +254,18 @@ mqtt_readPUBLISH(mqtt_msg_t * __restrict buf, char * _
 	/* data */
 	if (len < 0) {
 		mqtt_SetErr(EINVAL, "Short message length %d", len);
-		return NULL;
+		return -1;
 	} else {
-		if (!*datLen || !pData) {
-			if (!(pData = malloc(len + 1))) {
-				LOGERR;
-				return NULL;
-			} else {
-				*datLen = len;
-				((char*) pData)[len] = 0;
-			}
-		}
+		if (!(*pData = malloc(len + 1))) {
+			LOGERR;
+			return -1;
+		} else
+			((char*) (*pData))[len] = 0;
 
-		memset(pData, 0, *datLen);
-		if (len < *datLen)
-			*datLen = len;
-		memcpy(pData, pos, *datLen);
+		memcpy(*pData, pos, len);
 	}
 
-	return pData;
+	return len;
 }
 
 /*