X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Flogger.c;h=78d629ee2e5305a57e812522e7bb79c04f5ed1d2;hb=8c5cd31cecf9d91d362199dc89effcfe59072e13;hp=97fddecd3dbd7482180b277a253917abab6036f9;hpb=f79cc0e0bba16a3aa42a5fa13098cda714623205;p=meshlink diff --git a/src/logger.c b/src/logger.c index 97fddecd..78d629ee 100644 --- a/src/logger.c +++ b/src/logger.c @@ -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 && (size_t)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); + } }