diff options
| author | Garrett D'Amore <garrett@damore.org> | 2024-08-13 23:48:55 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2024-08-14 00:13:26 -0700 |
| commit | 6e44a39d1dc02c6d9cc7d9ab66c53bed36a4ce9e (patch) | |
| tree | 66969e095b9a8ca70b5966f252b0aa541ac136a8 /src/core | |
| parent | 620e7cee8d99362584d49179f4a791bc31ec3510 (diff) | |
| download | nng-6e44a39d1dc02c6d9cc7d9ab66c53bed36a4ce9e.tar.gz nng-6e44a39d1dc02c6d9cc7d9ab66c53bed36a4ce9e.tar.bz2 nng-6e44a39d1dc02c6d9cc7d9ab66c53bed36a4ce9e.zip | |
log: eliminate redundant newlines sometimes present
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/log.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/log.c b/src/core/log.c index e415e159..9f6a10d6 100644 --- a/src/core/log.c +++ b/src/core/log.c @@ -11,6 +11,7 @@ #include "nng_impl.h" #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <sys/types.h> #ifdef NNG_PLATFORM_WINDOWS #include <io.h> @@ -167,9 +168,11 @@ stderr_logger(nng_log_level level, nng_log_facility facility, strftime(when, sizeof(when), "%H:%M:%S", tm); // we print with millisecond resolution - (void) fprintf(stderr, "%s[%-6s]: %s.%03d: %s%s%s%s\n", sgr, level_str, + bool trailing_nl = + ((strlen(msg) != 0) && msg[strlen(msg) - 1] == '\n'); + (void) fprintf(stderr, "%s[%-6s]: %s.%03d: %s%s%s%s%s", sgr, level_str, when, nsec / 1000000, msgid ? msgid : "", msgid ? ": " : "", msg, - sgr0); + sgr0, trailing_nl ? "" : "\n"); } void |