update to mosquitto-v1.6.3

1 files changed, 20 insertions, 19 deletions

diff --git a/sub_client_output.c b/sub_client_output.c
index 9a177f4..19ae025 100644
--- a/sub_client_output.c
+++ b/sub_client_output.c
@@ -47,6 +47,7 @@ Contributors:
 #include <mosquitto.h>
 #include "client_shared.h"
 
+extern struct mosq_config cfg;
 
 static int get_time(struct tm **ti, long *ns)
 {
@@ -70,7 +71,7 @@ static int get_time(struct tm **ti, long *ns)
 	*ns = tv.tv_usec*1000;
 #else
 	if(clock_gettime(CLOCK_REALTIME, &ts) != 0){
-		fprintf(stderr, "Error obtaining system time.\n");
+		err_printf(&cfg, "Error obtaining system time.\n");
 		return 1;
 	}
 	s = ts.tv_sec;
@@ -79,7 +80,7 @@ static int get_time(struct tm **ti, long *ns)
 
 	*ti = localtime(&s);
 	if(!(*ti)){
-		fprintf(stderr, "Error obtaining system time.\n");
+		err_printf(&cfg, "Error obtaining system time.\n");
 		return 1;
 	}
 
@@ -140,7 +141,7 @@ static void json_print(const struct mosquitto_message *message, const struct tm
 }
 
 
-static void formatted_print(const struct mosq_config *cfg, const struct mosquitto_message *message)
+static void formatted_print(const struct mosq_config *lcfg, const struct mosquitto_message *message)
 {
 	int len;
 	int i;
@@ -149,13 +150,13 @@ static void formatted_print(const struct mosq_config *cfg, const struct mosquitt
 	char strf[3];
 	char buf[100];
 
-	len = strlen(cfg->format);
+	len = strlen(lcfg->format);
 
 	for(i=0; i<len; i++){
-		if(cfg->format[i] == '%'){
+		if(lcfg->format[i] == '%'){
 			if(i < len-1){
 				i++;
-				switch(cfg->format[i]){
+				switch(lcfg->format[i]){
 					case '%':
 						fputc('%', stdout);
 						break;
@@ -163,7 +164,7 @@ static void formatted_print(const struct mosq_config *cfg, const struct mosquitt
 					case 'I':
 						if(!ti){
 							if(get_time(&ti, &ns)){
-								fprintf(stderr, "Error obtaining system time.\n");
+								err_printf(lcfg, "Error obtaining system time.\n");
 								return;
 							}
 						}
@@ -175,7 +176,7 @@ static void formatted_print(const struct mosq_config *cfg, const struct mosquitt
 					case 'j':
 						if(!ti){
 							if(get_time(&ti, &ns)){
-								fprintf(stderr, "Error obtaining system time.\n");
+								err_printf(lcfg, "Error obtaining system time.\n");
 								return;
 							}
 						}
@@ -185,7 +186,7 @@ static void formatted_print(const struct mosq_config *cfg, const struct mosquitt
 					case 'J':
 						if(!ti){
 							if(get_time(&ti, &ns)){
-								fprintf(stderr, "Error obtaining system time.\n");
+								err_printf(lcfg, "Error obtaining system time.\n");
 								return;
 							}
 						}
@@ -223,7 +224,7 @@ static void formatted_print(const struct mosq_config *cfg, const struct mosquitt
 					case 'U':
 						if(!ti){
 							if(get_time(&ti, &ns)){
-								fprintf(stderr, "Error obtaining system time.\n");
+								err_printf(lcfg, "Error obtaining system time.\n");
 								return;
 							}
 						}
@@ -241,24 +242,24 @@ static void formatted_print(const struct mosq_config *cfg, const struct mosquitt
 						break;
 				}
 			}
-		}else if(cfg->format[i] == '@'){
+		}else if(lcfg->format[i] == '@'){
 			if(i < len-1){
 				i++;
-				if(cfg->format[i] == '@'){
+				if(lcfg->format[i] == '@'){
 					fputc('@', stdout);
 				}else{
 					if(!ti){
 						if(get_time(&ti, &ns)){
-							fprintf(stderr, "Error obtaining system time.\n");
+							err_printf(lcfg, "Error obtaining system time.\n");
 							return;
 						}
 					}
 
 					strf[0] = '%';
-					strf[1] = cfg->format[i];
+					strf[1] = lcfg->format[i];
 					strf[2] = 0;
 
-					if(cfg->format[i] == 'N'){
+					if(lcfg->format[i] == 'N'){
 						printf("%09ld", ns);
 					}else{
 						if(strftime(buf, 100, strf, ti) != 0){
@@ -267,10 +268,10 @@ static void formatted_print(const struct mosq_config *cfg, const struct mosquitt
 					}
 				}
 			}
-		}else if(cfg->format[i] == '\\'){
+		}else if(lcfg->format[i] == '\\'){
 			if(i < len-1){
 				i++;
-				switch(cfg->format[i]){
+				switch(lcfg->format[i]){
 					case '\\':
 						fputc('\\', stdout);
 						break;
@@ -305,10 +306,10 @@ static void formatted_print(const struct mosq_config *cfg, const struct mosquitt
 				}
 			}
 		}else{
-			fputc(cfg->format[i], stdout);
+			fputc(lcfg->format[i], stdout);
 		}
 	}
-	if(cfg->eol){
+	if(lcfg->eol){
 		fputc('\n', stdout);
 	}
 	fflush(stdout);