--- libaitmqtt/src/sub.c	2012/01/26 13:07:33	1.1.1.1
+++ libaitmqtt/src/sub.c	2012/04/07 20:54:57	1.1.1.1.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: sub.c,v 1.1.1.1 2012/01/26 13:07:33 misho Exp $
+* $Id: sub.c,v 1.1.1.1.2.1 2012/04/07 20:54:57 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
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -46,8 +46,6 @@ SUCH DAMAGE.
 #include "global.h"
 
 
-/* ------------------------------------------------------------------- */
-
 /*
  * mqtt_msgSUBSCRIBE() Create SUBSCRIBE message
  *
@@ -72,11 +70,11 @@ mqtt_msgSUBSCRIBE(mqtt_msg_t * __restrict buf, mqtt_su
 	if (!buf || !Topics)
 		return -1;
 	if (QOS > MQTT_QOS_EXACTLY) {
-		mqtt_SetErr(EINVAL, "Error:: invalid QoS parameter");
+		mqtt_SetErr(EINVAL, "Invalid QoS parameter");
 		return -1;
 	}
 	if (!msgID && QOS != MQTT_QOS_ONCE) {
-		mqtt_SetErr(EINVAL, "Error:: invalid MessageID parameter must be >0");
+		mqtt_SetErr(EINVAL, "Invalid MessageID parameter must be >0");
 		return -1;
 	}
 
@@ -186,11 +184,11 @@ mqtt_msgUNSUBSCRIBE(mqtt_msg_t * __restrict buf, mqtt_
 	if (!buf || !Topics)
 		return -1;
 	if (QOS > MQTT_QOS_EXACTLY) {
-		mqtt_SetErr(EINVAL, "Error:: invalid QoS parameter");
+		mqtt_SetErr(EINVAL, "Invalid QoS parameter");
 		return -1;
 	}
 	if (!msgID && QOS != MQTT_QOS_ONCE) {
-		mqtt_SetErr(EINVAL, "Error:: invalid MessageID parameter must be >0");
+		mqtt_SetErr(EINVAL, "Invalid MessageID parameter must be >0");
 		return -1;
 	}
 
@@ -297,7 +295,7 @@ mqtt_readSUBSCRIBE(mqtt_msg_t * __restrict buf, u_shor
 	/* MessageID */
 	len -= sizeof(mqtt_len_t);
 	if (len < 0) {
-		mqtt_SetErr(EINVAL, "Error:: short message length %d", len);
+		mqtt_SetErr(EINVAL, "Short message length %d", len);
 		return NULL;
 	} else {
 		*msgID = ntohs(v->val);
@@ -316,7 +314,7 @@ mqtt_readSUBSCRIBE(mqtt_msg_t * __restrict buf, u_shor
 		len -= MQTTHDR_VAR_SIZEOF(var) + 1;
 		if (len < 0) {
 			mqtt_subFree(subscr);
-			mqtt_SetErr(EINVAL, "Error:: short message length %d", len);
+			mqtt_SetErr(EINVAL, "Short message length %d", len);
 			return NULL;
 		}
 		subs = mqtt_subRealloc(subs, i + 1);
@@ -372,7 +370,7 @@ mqtt_readSUBACK(mqtt_msg_t * __restrict buf, u_short *
 	/* MessageID */
 	len -= sizeof(mqtt_len_t);
 	if (len < 0) {
-		mqtt_SetErr(EINVAL, "Error:: short message length %d", len);
+		mqtt_SetErr(EINVAL, "Short message length %d", len);
 		return -1;
 	} else {
 		*msgID = ntohs(v->val);
@@ -421,7 +419,7 @@ mqtt_readUNSUBSCRIBE(mqtt_msg_t * __restrict buf, u_sh
 	/* MessageID */
 	len -= sizeof(mqtt_len_t);
 	if (len < 0) {
-		mqtt_SetErr(EINVAL, "Error:: short message length %d", len);
+		mqtt_SetErr(EINVAL, "Short message length %d", len);
 		return NULL;
 	} else {
 		*msgID = ntohs(v->val);
@@ -440,7 +438,7 @@ mqtt_readUNSUBSCRIBE(mqtt_msg_t * __restrict buf, u_sh
 		len -= MQTTHDR_VAR_SIZEOF(var);
 		if (len < 0) {
 			mqtt_subFree(subscr);
-			mqtt_SetErr(EINVAL, "Error:: short message length %d", len);
+			mqtt_SetErr(EINVAL, "Short message length %d", len);
 			return NULL;
 		}
 		subs = mqtt_subRealloc(subs, i + 1);
@@ -483,7 +481,7 @@ mqtt_readUNSUBACK(mqtt_msg_t * __restrict buf)
 	if (!hdr)
 		return (u_short) -1;
 	if (len < sizeof(mqtt_len_t)) {
-		mqtt_SetErr(EINVAL, "Error:: short message length %d", len);
+		mqtt_SetErr(EINVAL, "Short message length %d", len);
 		return (u_short) -1;
 	} else {
 		pos = buf->msg_base + ret + 1;