X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flogger.c;h=effcb7887b883f6259eddf4e72ef3161aa2e1e70;hb=6e80da3370249caa1082c23c3ef55f338d1e9e74;hp=52a5bb27f35dbcfe0639c6c6aea4caedc8d07739;hpb=3112e6a863b4421eb1a0b32632b86c55e47f989e;p=tinc

diff --git a/src/logger.c b/src/logger.c
index 52a5bb27..effcb788 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,7 +1,7 @@
 /*
     logger.c -- logging code
-    Copyright (C) 2003 Guus Sliepen <guus@sliepen.eu.org>
-                  2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2004-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2004-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
     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.10 2003/08/17 09:04:00 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -51,7 +51,7 @@ void openlogger(const char *ident, logmode_t mode) {
 			break;
 		case LOGMODE_SYSLOG:
 #ifdef HAVE_MINGW
-			loghandle = OpenEventLog(NULL, identname);
+			loghandle = RegisterEventSource(NULL, logident);
 			if(!loghandle)
 				logmode = LOGMODE_NULL;
 			break;
@@ -78,7 +78,7 @@ void logger(int priority, const char *format, ...) {
 			fflush(stderr);
 			break;
 		case LOGMODE_FILE:
-			fprintf(logfile, "%ld %s[%d]: ", time(NULL), logident, logpid);
+			fprintf(logfile, "%ld %s[%ld]: ", time(NULL), logident, (long)logpid);
 			vfprintf(logfile, format, ap);
 			fprintf(logfile, "\n");
 			fflush(logfile);
@@ -87,8 +87,9 @@ void logger(int priority, const char *format, ...) {
 #ifdef HAVE_MINGW
 			{
 				char message[4096];
-				vsnprintf(message, sizeof(message), format, ap);
-				ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, &message, NULL);
+				char *messages[] = {message};
+				vsnprintf(message, sizeof message, format, ap);
+				ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL);
 			}
 #else
 #ifdef HAVE_SYSLOG_H
@@ -97,7 +98,7 @@ void logger(int priority, const char *format, ...) {
 #else
 			{
 				char message[4096];
-				vsnprintf(message, sizeof(message), format, ap);
+				vsnprintf(message, sizeof message, format, ap);
 				syslog(priority, "%s", message);
 			}
 #endif
@@ -118,7 +119,7 @@ void closelogger(void) {
 			break;
 		case LOGMODE_SYSLOG:
 #ifdef HAVE_MINGW
-			CloseEventLog(loghandle);
+			DeregisterEventSource(loghandle);
 			break;
 #else
 #ifdef HAVE_SYSLOG_H