Enable and fix many extra warnings supported by GCC and Clang.

[tinc] / src / sptps_keypair.c

diff --git a/src/sptps_keypair.c b/src/sptps_keypair.c
index 51a94ee..22433b9 100644 (file)
--- a/src/sptps_keypair.c
+++ b/src/sptps_keypair.c
@@ -1,6 +1,6 @@
 /*
     sptps_test.c -- Simple Peer-to-Peer Security test program
-    Copyright (C) 2011-2013 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2011-2022 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
@@ -23,11 +23,11 @@
 
 #include "crypto.h"
 #include "ecdsagen.h"
-#include "utils.h"
+#include "logger.h"
 
 static char *program_name;
 
-void logger(int level, int priority, const char *format, ...) {
+void logger(debug_t level, int priority, const char *format, ...) {
        (void)level;
        (void)priority;
        va_list ap;
@@ -39,7 +39,7 @@ void logger(int level, int priority, const char *format, ...) {
        fputc('\n', stderr);
 }
 
-static void usage() {
+static void usage(void) {
        fprintf(stderr, "Usage: %s [options] private_key_file public_key_file\n\n", program_name);
        fprintf(stderr, "Valid options are:\n"
                "  --help  Display this help and exit.\n"
@@ -97,12 +97,14 @@ int main(int argc, char *argv[]) {
        if(fp) {
                if(!ecdsa_write_pem_private_key(key, fp)) {
                        fprintf(stderr, "Could not write ECDSA private key\n");
+                       free(key);
                        return 1;
                }
 
                fclose(fp);
        } else {
                fprintf(stderr, "Could not open '%s' for writing: %s\n", argv[1], strerror(errno));
+               free(key);
                return 1;
        }
 
@@ -113,11 +115,12 @@ int main(int argc, char *argv[]) {
                        fprintf(stderr, "Could not write ECDSA public key\n");
                }
 
+               free(key);
                fclose(fp);
+               return 0;
        } else {
                fprintf(stderr, "Could not open '%s' for writing: %s\n", argv[2], strerror(errno));
+               free(key);
                return 1;
        }
-
-       return 0;
 }