X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprocess.c;h=37ba84b65e3aed922baf1ed406cab026fc4d2428;hb=3254e75afe0ff28fed68d8682f61c184f442161d;hp=bec78ba0e28c69120d633bad8be82422fee2d674;hpb=4200a378c4fedf64e89b9f8481d7cd09dac14965;p=tinc

diff --git a/src/process.c b/src/process.c
index bec78ba0..37ba84b6 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,7 +1,7 @@
 /*
     process.c -- process management functions
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -123,7 +123,7 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 			logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_SHUTDOWN");
 			break;
 		default:
-			logger(DEBUG_ALWAYS, LOG_WARNING, "Got unexpected request %d", request);
+			logger(DEBUG_ALWAYS, LOG_WARNING, "Got unexpected request %d", (int)request);
 			return ERROR_CALL_NOT_IMPLEMENTED;
 	}
 
@@ -135,10 +135,8 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 }
 
 VOID WINAPI run_service(DWORD argc, LPTSTR* argv) {
-	int err = 1;
 	extern int main2(int argc, char **argv);
 
-
 	status.dwServiceType = SERVICE_WIN32;
 	status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
 	status.dwWin32ExitCode = 0;
@@ -149,7 +147,6 @@ VOID WINAPI run_service(DWORD argc, LPTSTR* argv) {
 
 	if (!statushandle) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
-		err = 1;
 	} else {
 		status.dwWaitHint = 30000;
 		status.dwCurrentState = SERVICE_START_PENDING;
@@ -159,11 +156,10 @@ VOID WINAPI run_service(DWORD argc, LPTSTR* argv) {
 		status.dwCurrentState = SERVICE_RUNNING;
 		SetServiceStatus(statushandle, &status);
 
-		err = main2(argc, argv);
+		main2(argc, argv);
 
 		status.dwWaitHint = 0;
 		status.dwCurrentState = SERVICE_STOPPED;
-		//status.dwWin32ExitCode = err;
 		SetServiceStatus(statushandle, &status);
 	}