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 f96a259a6f29e9bef71426160f8a0de368174cd4..4e3f05c5237ffa07b7316151933dafb0ae9ae079 100644 (file)
--- 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 b9cd142d21f719ff6f8c47362e0be24abe05ca3e..74ace69fb19ecc307029845f8e8a3bdfaa6c83bf 100644 (file)
--- 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() */