--- mqtt/src/mqtt_ping.c	2012/07/03 12:46:00	1.3
+++ mqtt/src/mqtt_ping.c	2017/10/08 22:49:25	1.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: mqtt_ping.c,v 1.3 2012/07/03 12:46:00 misho Exp $
+* $Id: mqtt_ping.c,v 1.4 2017/10/08 22:49:25 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
@@ -48,8 +48,6 @@ SUCH DAMAGE.
 #include "client.h"
 
 
-io_enableDEBUG;
-
 extern char compiled[], compiledby[], compilehost[];
 
 struct tagArgs *args;
@@ -96,7 +94,7 @@ Ping(int sock, int num, struct timeval * __restrict ac
 	timersub(&after, &before, &calc);
 	timeradd(accu, &calc, accu);
 
-	printf(" + Ping %d MQTT broker %s ... %f sec.\n", num, io_n2addr(&args->addr, &val), 
+	printf(" + Ping %d MQTT broker %s ... %f sec.\n", num, e_n2addr(&args->addr, &val), 
 			calc.tv_sec + calc.tv_usec / 1.e6);
 	AIT_FREE_VAL(&val);
 
@@ -114,7 +112,7 @@ main(int argc, char **argv)
 	register int i;
 	struct timeval accu;
 
-	if (!(args = io_malloc(sizeof(struct tagArgs)))) {
+	if (!(args = e_malloc(sizeof(struct tagArgs)))) {
 		printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno));
 		return 1;
 	} else
@@ -124,7 +122,7 @@ main(int argc, char **argv)
 	if (!(args->msg = mqtt_msgAlloc(USHRT_MAX))) {
 		printf("Error:: in mqtt buffer #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
 		args->free(args);
-		io_free(args);
+		e_free(args);
 		return 1;
 	}
 
@@ -153,12 +151,12 @@ main(int argc, char **argv)
 				port = (u_short) strtol(optarg, NULL, 0);
 				break;
 			case 'v':
-				io_incDebug;
+				e_incVerbose;
 				break;
 			case 'h':
 			default:
 				args->free(args);
-				io_free(args);
+				e_free(args);
 				Usage();
 				return 1;
 		}
@@ -167,26 +165,26 @@ main(int argc, char **argv)
 	if (argc < 2) {
 		printf("Error:: host for connect not found or connection id!\n\n");
 		args->free(args);
-		io_free(args);
+		e_free(args);
 		Usage();
 		return 1;
 	} else {
 		AIT_FREE_VAL(&args->ConnID);
 		AIT_SET_STR(&args->ConnID, argv[1]);
 	}
-	if (!io_gethostbyname(*argv, port, &args->addr)) {
-		printf("Error:: host not valid #%d - %s\n", io_GetErrno(), io_GetError());
+	if (!e_gethostbyname(*argv, port, &args->addr)) {
+		printf("Error:: host not valid #%d - %s\n", elwix_GetErrno(), elwix_GetError());
 		args->free(args);
-		io_free(args);
+		e_free(args);
 		Usage();
 		return 1;
 	}
-	printf("Connecting to %s:%d ... ", io_n2addr(&args->addr, &val), io_n2port(&args->addr));
+	printf("Connecting to %s:%d ... ", e_n2addr(&args->addr, &val), e_n2port(&args->addr));
 	AIT_FREE_VAL(&val);
 
 	if (!(args->cli = mqtt_cli_Open(&args->addr.sa, args->ka))) {
 		args->free(args);
-		io_free(args);
+		e_free(args);
 		return 2;
 	}
 
@@ -229,6 +227,6 @@ main(int argc, char **argv)
 	mqtt_cli_Close(&args->cli);
 
 	args->free(args);
-	io_free(args);
+	e_free(args);
 	return ret;
 }