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

diff --git a/src/logger.c b/src/logger.c
index 52a5bb27..bc20438c 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
@@ -13,11 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    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 $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
@@ -51,7 +49,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 +76,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 +85,9 @@ void logger(int priority, const char *format, ...) {
 #ifdef HAVE_MINGW
 			{
 				char message[4096];
+				const char *messages[] = {message};
 				vsnprintf(message, sizeof(message), format, ap);
-				ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, &message, NULL);
+				ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL);
 			}
 #else
 #ifdef HAVE_SYSLOG_H
@@ -118,7 +117,7 @@ void closelogger(void) {
 			break;
 		case LOGMODE_SYSLOG:
 #ifdef HAVE_MINGW
-			CloseEventLog(loghandle);
+			DeregisterEventSource(loghandle);
 			break;
 #else
 #ifdef HAVE_SYSLOG_H