[Box Backup-commit] COMMIT r2287 - box/trunk/lib/win32

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2008-09-14 01:40:23 +0100 (Sun, 14 Sep 2008)
New Revision: 2287

Modified:
   box/trunk/lib/win32/emu.cpp
Log:
FIx [2285] properly for Windows.


Modified: box/trunk/lib/win32/emu.cpp
===================================================================
--- box/trunk/lib/win32/emu.cpp	2008-09-14 00:29:32 UTC (rev 2286)
+++ box/trunk/lib/win32/emu.cpp	2008-09-14 00:40:23 UTC (rev 2287)
@@ -1408,19 +1408,19 @@
 
 void openlog(const char * daemonName, int, int)
 {
+	std::string nameStr = "Box Backup (";
+	nameStr += daemonName;
+	nameStr += ")";
+
 	// register a default event source, so that we can
 	// log errors with the process of adding or registering our own.
 	gSyslogH = RegisterEventSource(
 		NULL,        // uses local computer 
-		daemonName); // source name
+		nameStr.c_str()); // source name
 	if (gSyslogH == NULL) 
 	{
 	}
 
-	std::string nameStr = "Box Backup (";
-	nameStr += daemonName;
-	nameStr += ")";
-
 	char* name = strdup(nameStr.c_str());
 	BOOL success = AddEventSource(name, 0);
 	free(name);
@@ -1431,7 +1431,7 @@
 		return;
 	}
 
-	HANDLE newSyslogH = RegisterEventSource(NULL, daemonName);
+	HANDLE newSyslogH = RegisterEventSource(NULL, nameStr.c_str());
 	if (newSyslogH == NULL)
 	{
 		::syslog(LOG_ERR, "Failed to register our own event source: "