--- libaitmqtt/src/pub.c	2012/06/21 13:47:30	1.2.2.1
+++ libaitmqtt/src/pub.c	2013/05/30 09:18:33	1.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: pub.c,v 1.2.2.1 2012/06/21 13:47:30 misho Exp $
+* $Id: pub.c,v 1.4 2013/05/30 09:18:33 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
@@ -128,7 +128,7 @@ mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const cha
 static int
 _mqtt_msgPUB_(mqtt_msg_t * __restrict buf, u_char cmd, u_short msgID)
 {
-	int siz = 0;
+	int siz = sizeof(struct mqtthdr);
 	struct mqtthdr *hdr;
 	mqtt_len_t *v;
 
@@ -137,12 +137,8 @@ _mqtt_msgPUB_(mqtt_msg_t * __restrict buf, u_char cmd,
 
 	if (mqtt_msgRealloc(buf, sizeof(struct mqtthdr) + sizeof(mqtt_len_t)) == -1)
 		return -1;
-	else {
-		hdr = (struct mqtthdr *) (buf->msg_base + siz);
-		siz += sizeof(struct mqtthdr);
-		v = (mqtt_len_t*) (buf->msg_base + siz);
-		siz += sizeof(mqtt_len_t);
-	}
+	else
+		hdr = (struct mqtthdr *) buf->msg_base;
 
 	/* fixed header */
 	MQTTHDR_MSGINIT(hdr);
@@ -150,7 +146,9 @@ _mqtt_msgPUB_(mqtt_msg_t * __restrict buf, u_char cmd,
 	*hdr->mqtt_len = sizeof(mqtt_len_t);
 
 	/* MessageID */
+	v = (mqtt_len_t*) (buf->msg_base + siz);
 	v->val = htons(msgID);
+	siz += sizeof(mqtt_len_t);
 
 	return siz;
 }
@@ -162,7 +160,7 @@ _mqtt_msgPUB_(mqtt_msg_t * __restrict buf, u_char cmd,
  * @msgID = MessageID
  * return: -1 error or >-1 message size for send
  */
-inline int
+int
 mqtt_msgPUBACK(mqtt_msg_t * __restrict buf, u_short msgID)
 {
 	return _mqtt_msgPUB_(buf, MQTT_TYPE_PUBACK, msgID);
@@ -175,7 +173,7 @@ mqtt_msgPUBACK(mqtt_msg_t * __restrict buf, u_short ms
  * @msgID = MessageID
  * return: -1 error or >-1 message size for send
  */
-inline int
+int
 mqtt_msgPUBREC(mqtt_msg_t * __restrict buf, u_short msgID)
 {
 	return _mqtt_msgPUB_(buf, MQTT_TYPE_PUBREC, msgID);
@@ -188,7 +186,7 @@ mqtt_msgPUBREC(mqtt_msg_t * __restrict buf, u_short ms
  * @msgID = MessageID
  * return: -1 error or >-1 message size for send
  */
-inline int
+int
 mqtt_msgPUBREL(mqtt_msg_t * __restrict buf, u_short msgID)
 {
 	return _mqtt_msgPUB_(buf, MQTT_TYPE_PUBREL, msgID);
@@ -201,7 +199,7 @@ mqtt_msgPUBREL(mqtt_msg_t * __restrict buf, u_short ms
  * @msgID = MessageID
  * return: -1 error or >-1 message size for send
  */
-inline int
+int
 mqtt_msgPUBCOMP(mqtt_msg_t * __restrict buf, u_short msgID)
 {
 	return _mqtt_msgPUB_(buf, MQTT_TYPE_PUBCOMP, msgID);