Fix compiler warnings.

diff --git a/examples/manynodes.c b/examples/manynodes.c
index bdc99bcf70d83566b6511d6c33cc9d8f7ffa9f52..a0781ba66180b0ec2944e0062ac5c82145c290f3 100644 (file)
--- a/examples/manynodes.c
+++ b/examples/manynodes.c
@@ -382,7 +382,6 @@ int main(int argc, char *argv[]) {
        for(int i = 0; i < n; i++) {
                snprintf(nodename, sizeof(nodename), "%snode%d", namesprefix, i);
                snprintf(filename, sizeof(filename), "%s/%s", basebase, nodename);
-               bool itsnew = access(filename, R_OK);
                if(n / (i + 1) > n / 4)
                        mesh[i] = meshlink_open(filename, nodename, "manynodes", DEV_CLASS_BACKBONE);
                else

diff --git a/src/devtools.c b/src/devtools.c
index 7068c726cec016035bf37199c184cbdd74b02f2a..ca59ad9b9e54a8b7b4a04aad9da3c58af7296900 100644 (file)
--- a/src/devtools.c
+++ b/src/devtools.c
@@ -10,16 +10,6 @@
 
 #include "devtools.h"
 
-static int node_compare(const void *a, const void *b) {
-       if(a < b)
-               return -1;
-
-       if(a > b)
-               return 1;
-
-       return 0;
-}
-
 static bool fstrwrite(const char *str, FILE *stream) {
        size_t len = strlen(str);
 

diff --git a/src/discovery.c b/src/discovery.c
index 8248e9e7be4e151818f1be74fddc62f0c940bfd0..0ef1001da471901f766f2206d93c356fc515cc3b 100644 (file)
--- a/src/discovery.c
+++ b/src/discovery.c
@@ -389,6 +389,7 @@ static void discovery_log_cb(CattaLogLevel level, const char *txt) {
                break;
 
        case CATTA_LOG_DEBUG:
+       default:
                mlevel = MESHLINK_DEBUG;
                break;
        }

diff --git a/src/meshlink++.h b/src/meshlink++.h
index a949f761e935436f8baabdd3699ff7176f1671cc..bfc7173d8d3cf19d6e65655595e4016b32ad3310 100644 (file)
--- a/src/meshlink++.h
+++ b/src/meshlink++.h
@@ -624,7 +624,7 @@ private:
        meshlink_handle_t *handle;
 };
 
-static const char *strerror(errno_t err = meshlink_errno) {
+static inline const char *strerror(errno_t err = meshlink_errno) {
        return meshlink_strerror(err);
 }
 
@@ -638,7 +638,7 @@ static const char *strerror(errno_t err = meshlink_errno) {
  *
  *  @return         This function will return true if the MeshLink instance was succesfully destroyed, false otherwise.
  */
-static bool destroy(const char *confbase) {
+static inline bool destroy(const char *confbase) {
        return meshlink_destroy(confbase);
 }
 }

diff --git a/src/meshlink.c b/src/meshlink.c
index 5d75e0688bcda7858048b57ed9d3644750f0cc6d..f038043fb985b955158a420858cbce782f3179d8 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -1208,8 +1208,8 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const
        memset(hdr, 0, sizeof(*hdr));
        // leave the last byte as 0 to make sure strings are always
        // null-terminated if they are longer than the buffer
-       strncpy(hdr->destination, destination->name, (sizeof(hdr)->destination) - 1);
-       strncpy(hdr->source, mesh->self->name, (sizeof(hdr)->source) - 1);
+       strncpy((char *)hdr->destination, destination->name, (sizeof(hdr)->destination) - 1);
+       strncpy((char *)hdr->source, mesh->self->name, (sizeof(hdr)->source) - 1);
 
        memcpy(packet->data + sizeof(*hdr), data, len);
 

diff --git a/src/meshlink.h b/src/meshlink.h
index be929c29e23680657e14a095064ac652b22ff66e..e85be2ff9d7b58769d3c1f4a43dd63e358a29eb8 100644 (file)
--- a/src/meshlink.h
+++ b/src/meshlink.h
@@ -37,10 +37,10 @@ extern "C" {
 #endif
 
 /// The length in bytes of a signature made with meshlink_sign()
-#define MESHLINK_SIGLEN  (64)
+#define MESHLINK_SIGLEN (64ul)
 
 // The maximum length of fingerprints
-#define MESHLINK_FINGERPRINTLEN  (64)
+#define MESHLINK_FINGERPRINTLEN (64ul)
 
 /// A handle for an instance of MeshLink.
 typedef struct meshlink_handle meshlink_handle_t;

diff --git a/test/channels-fork.c b/test/channels-fork.c
index 673760e2b837535f18faec98f07dbb0bfb721b2f..faa16c6ef715b2efb6e03b0709b5df24fe9f0e04 100644 (file)
--- a/test/channels-fork.c
+++ b/test/channels-fork.c
@@ -184,7 +184,7 @@ int main2(int rfd, int wfd) {
 
 
 int main(int argc, char *argv[]) {
-       int fda[2], fdb[2], result;
+       int fda[2], fdb[2];
 
        pipe2(fda, 0);
        pipe2(fdb, 0);

diff --git a/test/trio.c b/test/trio.c
index 0a494c28e3d36f0c2fa8f2f953ee6a0df709a615..486aac3ebb19ad430fc4c5de08b731e4bdd8a735 100644 (file)
--- a/test/trio.c
+++ b/test/trio.c
@@ -5,6 +5,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <assert.h>
+#include <sys/time.h>
 
 #include "meshlink.h"
 #include "utils.h"