Fix compiler warnings.

diff --git a/src/fd_device.c b/src/fd_device.c
index 5cfe75fe3914cd66887b71e9d4db14d5b783fb93..8ac51fa1420984da1773410d631f642ceb0a16a8 100644 (file)
--- a/src/fd_device.c
+++ b/src/fd_device.c
@@ -83,7 +83,7 @@ static int read_fd(int socket) {
 
        if(cmsgptr->cmsg_len != CMSG_LEN(sizeof(device_fd))) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Wrong CMSG data length: %lu, expected %lu!",
-                      (unsigned long)cmsgptr->cmsg_len, CMSG_LEN(sizeof(device_fd)));
+                      (unsigned long)cmsgptr->cmsg_len, (unsigned long)CMSG_LEN(sizeof(device_fd)));
                return -1;
        }
 

diff --git a/src/tincctl.c b/src/tincctl.c
index 87bbfe0187e64e5548e15230143adf5a73393a09..3c7d3683e9da4fb375f373f4f4277f8aa13436ca 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -263,19 +263,21 @@ static void disable_old_keys(const char *filename, const char *what) {
        bool disabled = false;
        bool block = false;
        bool error = false;
-       FILE *r, *w;
 
-       r = fopen(filename, "r");
+       FILE *r = fopen(filename, "r");
+       FILE *w = NULL;
 
        if(!r) {
                return;
        }
 
-       snprintf(tmpfile, sizeof(tmpfile), "%s.tmp", filename);
+       int result = snprintf(tmpfile, sizeof(tmpfile), "%s.tmp", filename);
 
-       struct stat st = {.st_mode = 0600};
-       fstat(fileno(r), &st);
-       w = fopenmask(tmpfile, "w", st.st_mode);
+       if(result < sizeof(tmpfile)) {
+               struct stat st = {.st_mode = 0600};
+               fstat(fileno(r), &st);
+               w = fopenmask(tmpfile, "w", st.st_mode);
+       }
 
        while(fgets(buf, sizeof(buf), r)) {
                if(!block && !strncmp(buf, "-----BEGIN ", 11)) {