Fix warnings when compiling for Windows.

[tinc] / src / dropin.c

diff --git a/src/dropin.c b/src/dropin.c
index fe3b7ef..0cde7a0 100644 (file)
--- a/src/dropin.c
+++ b/src/dropin.c
@@ -1,7 +1,7 @@
 /*
     dropin.c -- a set of drop-in replacements for libc functions
     Copyright (C) 2000-2005 Ivo Timmermans,
-                  2000-2016 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2018 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
@@ -50,8 +50,9 @@ int daemon(int nochdir, int noclose) {
        }
 
        /* If we are the parent, terminate */
-       if(pid)
+       if(pid) {
                exit(0);
+       }
 
        /* Detach by becoming the new process group leader */
        if(setsid() < 0) {
@@ -81,6 +82,8 @@ int daemon(int nochdir, int noclose) {
 
        return 0;
 #else
+       (void)nochdir;
+       (void)noclose;
        return -1;
 #endif
 }
@@ -108,11 +111,12 @@ int vasprintf(char **buf, const char *fmt, va_list ap) {
        status = vsnprintf(*buf, len, fmt, aq);
        va_end(aq);
 
-       if(status >= 0)
+       if(status >= 0) {
                *buf = xrealloc(*buf, status + 1);
+       }
 
        if(status > len - 1) {
-               len = status;
+               len = status + 1;
                va_copy(aq, ap);
                status = vsnprintf(*buf, len, fmt, aq);
                va_end(aq);
@@ -142,6 +146,7 @@ int gettimeofday(struct timeval *tv, void *tz) {
 
 #ifndef HAVE_NANOSLEEP
 int nanosleep(const struct timespec *req, struct timespec *rem) {
+       (void)rem;
        struct timeval tv = {req->tv_sec, req->tv_nsec / 1000};
        return select(0, NULL, NULL, NULL, &tv);
 }