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

diff --git a/src/logger.c b/src/logger.c
index de662270..1f7785f2 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -17,28 +17,22 @@
     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.6 2003/07/28 22:06:09 guus Exp $
 */
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <syslog.h>
+#include "system.h"
 
 #include "conf.h"
 #include "logger.h"
 
-#include "system.h"
-
-volatile int debug_level = DEBUG_NOTHING;
-int logmode = LOGMODE_STDERR;
-pid_t logpid;
+debug_t debug_level = DEBUG_NOTHING;
+static logmode_t logmode = LOGMODE_STDERR;
+static pid_t logpid;
 extern char *logfilename;
-FILE *logfile = NULL;
-const char *logident = NULL;
-
-void openlogger(const char *ident, int mode) {
-	char *fname;
+static FILE *logfile = NULL;
+static const char *logident = NULL;
 
+void openlogger(const char *ident, logmode_t mode) {
 	logident = ident;
 	logmode = mode;
 	
@@ -53,23 +47,32 @@ void openlogger(const char *ident, int mode) {
 				logmode = LOGMODE_NULL;
 			break;
 		case LOGMODE_SYSLOG:
+#ifdef HAVE_SYSLOG
 			openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
 			break;
+#endif
+		case LOGMODE_NULL:
+			break;
 	}
 }
 
-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;
 		case LOGMODE_SYSLOG:
+#ifdef HAVE_SYSLOG
 #ifdef HAVE_VSYSLOG
 			vsyslog(priority, format, ap);
 #else
@@ -80,7 +83,12 @@ void vlogger(int priority, const char *format, va_list ap) {
 			}
 #endif
 			break;
+#endif
+		case LOGMODE_NULL:
+			break;
 	}
+
+	va_end(ap);
 }
 
 void closelogger(void) {
@@ -89,7 +97,13 @@ void closelogger(void) {
 			fclose(logfile);
 			break;
 		case LOGMODE_SYSLOG:
+#ifdef HAVE_SYSLOG
 			closelog();
 			break;
+#endif
+		case LOGMODE_NULL:
+		case LOGMODE_STDERR:
+			break;
+			break;
 	}
 }