X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flogger.c;h=012f19d0f0eecf27e2d60d33dd1c56b33cf06fe2;hp=de6622701b76200dbd4237a5650383d3024be52e;hb=5db596c6844169f1eb5f804b72abe99d067aaa5a;hpb=0b9175e998c2180e5d73ef3d644a49d620c68cad

diff --git a/src/logger.c b/src/logger.c
index de662270..012f19d0 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -17,28 +17,27 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: logger.c,v 1.1.2.1 2003/07/06 22:11:31 guus Exp $
+    $Id: logger.c,v 1.1.2.3 2003/07/12 17:41:45 guus Exp $
 */
 
 #include <stdio.h>
 #include <stdarg.h>
 #include <syslog.h>
+#include <unistd.h>
 
 #include "conf.h"
 #include "logger.h"
 
 #include "system.h"
 
-volatile int debug_level = DEBUG_NOTHING;
-int logmode = LOGMODE_STDERR;
-pid_t logpid;
+int debug_level = DEBUG_NOTHING;
+static int logmode = LOGMODE_STDERR;
+static pid_t logpid;
 extern char *logfilename;
-FILE *logfile = NULL;
-const char *logident = NULL;
+static FILE *logfile = NULL;
+static const char *logident = NULL;
 
 void openlogger(const char *ident, int mode) {
-	char *fname;
-
 	logident = ident;
 	logmode = mode;
 	
@@ -58,14 +57,18 @@ void openlogger(const char *ident, int mode) {
 	}
 }
 
-void vlogger(int priority, const char *format, va_list ap) {
+void logger(int priority, const char *format, ...) {
+	va_list ap;
+
+	va_start(ap, format);
+
 	switch(logmode) {
 		case LOGMODE_STDERR:
 			vfprintf(stderr, format, ap);
 			fprintf(stderr, "\n");
 			break;
 		case LOGMODE_FILE:
-			fprintf(logfile, "%d %s[%d]: ", time(NULL), logident, logpid);
+			fprintf(logfile, "%ld %s[%d]: ", time(NULL), logident, logpid);
 			vfprintf(logfile, format, ap);
 			fprintf(logfile, "\n");
 			break;
@@ -81,6 +84,8 @@ void vlogger(int priority, const char *format, va_list ap) {
 #endif
 			break;
 	}
+
+	va_end(ap);
 }
 
 void closelogger(void) {