From 347a33b009700a447e723ae83359851d6b4e7e02 Mon Sep 17 00:00:00 2001 From: Warren Dukes Date: Tue, 3 Oct 2006 02:22:37 +0000 Subject: cleanup flushWarningBuffer() and make some for() loops in audio.c look and do something sane. git-svn-id: https://svn.musicpd.org/mpd/trunk@4867 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/log.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'src/log.c') diff --git a/src/log.c b/src/log.c index a59b331f1..2e6eb3575 100644 --- a/src/log.c +++ b/src/log.c @@ -93,22 +93,28 @@ static void do_log(FILE *fp, const char *fmt, va_list args) void flushWarningLog(void) { - char *s; + char *s = warningBuffer; DEBUG("flushing warning messages\n"); - if (warningBuffer == NULL) - return; - - s = strtok(warningBuffer, "\n"); - while (s != NULL) { - fprintf(stderr, "%s\n", s); - s = strtok(NULL, "\n"); + if (warningBuffer != NULL) + { + while (s != NULL) { + char * next = strchr(s, '\n'); + if (next != NULL) { + *next = '\0'; + next++; + } + fprintf(stderr, "%s\n", s); + s = next; + } + + warningBuffer = NULL; } - free(warningBuffer); - warningBuffer = NULL; warningFlushed = 1; + + DEBUG("done flushing warning messages\n"); } void initLog(const int verbose) -- cgit v1.2.3