From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 14 Oct 2012 17:21:13 +0000 (+0200)
Subject: Fix a few compiler errors/warnings.
X-Git-Tag: import-tinc-1.1~251
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=3254e75afe0ff28fed68d8682f61c184f442161d;p=meshlink

Fix a few compiler errors/warnings.
---

diff --git a/src/net_socket.c b/src/net_socket.c
index a7c78152..09c52070 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -63,7 +63,7 @@ static void configure_tcp(connection_t *c) {
 	unsigned long arg = 1;
 
 	if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "ioctlsocket for %s: %d", c->hostname, sockstrerror(sockerrno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "ioctlsocket for %s: %s", c->hostname, sockstrerror(sockerrno));
 	}
 #endif
 
diff --git a/src/process.c b/src/process.c
index c8231afb..37ba84b6 100644
--- a/src/process.c
+++ b/src/process.c
@@ -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);
 	}