X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Flogger.c;h=78d629ee2e5305a57e812522e7bb79c04f5ed1d2;hb=eaea9a2ea3c80478a6aa4e502afaed5b5b6bbfde;hp=f77252bd64e3a79731667f5bed193196029434f7;hpb=76c7550c8ab0e9c0ee14a9c396baa008cfb9bc42;p=meshlink

diff --git a/src/logger.c b/src/logger.c
index f77252bd..78d629ee 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,6 +1,6 @@
 /*
     logger.c -- logging code
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,12 +25,16 @@
 
 // TODO: refactor logging code to use a meshlink_handle_t *.
 void logger(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *format, ...) {
+	assert(format);
+
 	if(mesh) {
-		if(level < mesh->log_level || !mesh->log_cb)
+		if(level < mesh->log_level || !mesh->log_cb) {
 			return;
+		}
 	} else {
-		if(level < global_log_level || !global_log_cb)
+		if(level < global_log_level || !global_log_cb) {
 			return;
+		}
 	}
 
 	va_list ap;
@@ -40,11 +44,13 @@ void logger(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *for
 	int len = vsnprintf(message, sizeof(message), format, ap);
 	va_end(ap);
 
-	if(len > 0 && len < sizeof(message) && message[len - 1] == '\n')
+	if(len > 0 && (size_t)len < sizeof(message) && message[len - 1] == '\n') {
 		message[len - 1] = 0;
+	}
 
-	if(mesh)
+	if(mesh) {
 		mesh->log_cb(mesh, level, message);
-	else
+	} else {
 		global_log_cb(NULL, level, message);
+	}
 }