--- mqtt/src/client.c	2012/07/03 09:02:50	1.3
+++ mqtt/src/client.c	2017/10/08 22:49:24	1.5
@@ -1,3 +1,48 @@
+/*************************************************************************
+* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
+*  by Michael Pounov <misho@openbsd-bg.org>
+*
+* $Author: misho $
+* $Id: client.c,v 1.5 2017/10/08 22:49:24 misho Exp $
+*
+**************************************************************************
+The ELWIX and AITNET software is distributed under the following
+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, 2013
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #include "global.h"
 #include "mqtt.h"
 #include "client.h"
@@ -23,7 +68,7 @@ ConnectClient(int sock)
 		printf("Error:: send() #%d - %s\n", errno, strerror(errno));
 		return -1;
 	} else
-		ioVERBOSE(3) printf("Sended CONNECT %d bytes\n", siz);
+		EVERBS(3) printf("Sended CONNECT %d bytes\n", siz);
 
 	pfd.fd = sock;
 	pfd.events = POLLIN | POLLPRI;
@@ -32,7 +77,7 @@ ConnectClient(int sock)
 			printf("Error:: poll() #%d - %s\n", errno, strerror(errno));
 			return -1;
 		case 0:
-			ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000);
+			EVERBS(3) printf("Timeout reached (%d) ...\n", args->ka * 1000);
 			return -1;
 	}
 	if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL))
@@ -44,7 +89,7 @@ ConnectClient(int sock)
 		printf("Error:: recv() #%d - %s\n", errno, strerror(errno));
 		return -1;
 	} else
-		ioVERBOSE(3) printf("Received %d bytes\n", siz);
+		EVERBS(3) printf("Received %d bytes\n", siz);
 
 	return (u_char) mqtt_readCONNACK(args->msg);
 }
@@ -84,7 +129,7 @@ CloseFile(void)
 	}
 }
 
-inline int
+int
 SendTo(int sock, int siz)
 {
 	siz = send(sock, args->msg->msg_base, siz, MSG_NOSIGNAL);
@@ -92,12 +137,12 @@ SendTo(int sock, int siz)
 		printf("Error:: send() #%d - %s\n", errno, strerror(errno));
 		return -1;
 	} else
-		ioVERBOSE(3) printf("Sended %d bytes\n", siz);
+		EVERBS(3) printf("Sended %d bytes\n", siz);
 
 	return siz;
 }
 
-inline int
+int
 RecvFrom(int sock)
 {
 	struct pollfd pfd;
@@ -113,7 +158,7 @@ RecvFrom(int sock)
 				printf("Error:: poll() #%d - %s\n", errno, strerror(errno));
 				return -1;
 			case 0:
-				ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000);
+				EVERBS(3) printf("Timeout reached (%d) ...\n", args->ka * 1000);
 				if (mqtt_KeepAlive(sock, args->ka, 1) == -1)
 					return -1;
 				continue;
@@ -127,7 +172,7 @@ RecvFrom(int sock)
 		printf("Error:: recv() #%d - %s\n", errno, strerror(errno));
 		return -1;
 	} else
-		ioVERBOSE(3) printf("Received %d bytes\n", siz);
+		EVERBS(3) printf("Received %d bytes\n", siz);
 
 	return siz;
 }