aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/interface.c1
-rw-r--r--src/myfprintf.c8
-rw-r--r--src/sllist.c1
-rw-r--r--src/sllist.h2
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
*