From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 31 May 2016 12:37:42 +0000 (+0000)
Subject: fixup strsep and windows event assignment.
X-Git-Tag: release-1.5.9rc1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41b78b263d011954d3eceb4a3d4fee903f9b0882;p=thirdparty%2Funbound.git

fixup strsep and windows event assignment.


git-svn-id: file:///svn/unbound/trunk@3739 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/compat/strsep.c b/compat/strsep.c
index f96a259a6..4e3f05c52 100644
--- a/compat/strsep.c
+++ b/compat/strsep.c
@@ -35,7 +35,7 @@
 static int
 in_delim(char c, const char* delim)
 {
-	char* p;
+	const char* p;
 	if(!delim)
 		return 0;
 	for(p=delim; *p; p++) {
@@ -59,7 +59,7 @@ char *strsep(char **stringp, const char *delim)
 		*s = 0;
 		*stringp = s+1;
 	} else {
-		*stringp = s;
+		*stringp = NULL;
 	}
 	return orig;
 }
diff --git a/winrc/win_svc.c b/winrc/win_svc.c
index b9cd142d2..74ace69fb 100644
--- a/winrc/win_svc.c
+++ b/winrc/win_svc.c
@@ -60,7 +60,7 @@ static SERVICE_STATUS_HANDLE service_status_handle;
 /** global service stop event */
 static WSAEVENT service_stop_event = NULL;
 /** event struct for stop callbacks */
-static struct event* service_stop_ev = NULL;
+static struct ub_event* service_stop_ev = NULL;
 /** if stop even means shutdown or restart */
 static int service_stop_shutdown = 0;
 /** config file to open. global communication to service_main() */