diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-07-30 03:57:29 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2006-07-30 03:57:29 +0000 |
| commit | a331939d654624c0f5e82f0d8be53f69bdaa1a59 (patch) | |
| tree | 9b9dfc41a8154f2f2c9e3be96b7a2d8bd6d08b55 /src | |
| parent | 4cf5d04ca15bc28ee4636d1dccb858763513e571 (diff) | |
| download | mpd-a331939d654624c0f5e82f0d8be53f69bdaa1a59.tar.gz mpd-a331939d654624c0f5e82f0d8be53f69bdaa1a59.tar.xz mpd-a331939d654624c0f5e82f0d8be53f69bdaa1a59.zip | |
fix some warnings introduced in the big malloc-reduction patch
The myfprintf bugs that are fixed here were NOT introduced in the
last patch, it's just that the stricter warning checks from moving
to fprintf caused string format bugs to actually be checked by gcc
git-svn-id: https://svn.musicpd.org/mpd/trunk@4484 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src')
| -rw-r--r-- | src/interface.c | 1 | ||||
| -rw-r--r-- | src/myfprintf.c | 8 | ||||
| -rw-r--r-- | src/sllist.c | 1 | ||||
| -rw-r--r-- | src/sllist.h | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/src/interface.c b/src/interface.c index a75890ac4..130deffad 100644 --- a/src/interface.c +++ b/src/interface.c @@ -25,6 +25,7 @@ #include "playlist.h" #include "permission.h" #include "sllist.h" +#include "utils.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/myfprintf.c b/src/myfprintf.c index 7a547f92e..500414d0b 100644 --- a/src/myfprintf.c +++ b/src/myfprintf.c @@ -92,14 +92,16 @@ int myfprintfCloseAndOpenLogFile(void) fopen(myfprintf_outFilename, "a+")) == NULL && errno == EINTR) ; if (!myfprintf_out) { - ERROR("error re-opening log file: %s\n", myfprintf_out); + ERROR("error re-opening log file: %s\n", + myfprintf_outFilename); return -1; } while ((myfprintf_err = fopen(myfprintf_errFilename, "a+")) == NULL && errno == EINTR) ; - if (!myfprintf_out) { - ERROR("error re-opening log file: %s\n", myfprintf_out); + if (!myfprintf_err) { + ERROR("error re-opening error file: %s\n", + myfprintf_errFilename); return -1; } while (dup2(fileno(myfprintf_out), 1) < 0 && errno == EINTR) ; diff --git a/src/sllist.c b/src/sllist.c index 1c11c973d..e25615863 100644 --- a/src/sllist.c +++ b/src/sllist.c @@ -18,6 +18,7 @@ /* a very simple singly-linked-list structure for queues/buffers */ +#include <string.h> #include "sllist.h" #include "utils.h" diff --git a/src/sllist.h b/src/sllist.h index 3ac1d1846..1733e955a 100644 --- a/src/sllist.h +++ b/src/sllist.h @@ -3,8 +3,6 @@ #ifndef SLLIST_H #define SLLIST_H -#include "utils.h" - /* just free the entire structure if it's free-able, the 'data' member * should _NEVER_ be explicitly freed * |