Remove errno and errstr from meshlink_handle_t, add thread-local meshlink_errno.

Errors can happen outside of the context of a meshlink handle, for example
if meshlink_open() itself fails. Furthermore, errstr can always be derived
from errno, so it is redundant.

diff --git a/examples/chat.c b/examples/chat.c
index 70d17d7d917bf6515aaf98d1fb97bea2f969df22..1c07e422d07a2fa7efb20c015d94db81246be21f 100644 (file)
--- a/examples/chat.c
+++ b/examples/chat.c
@@ -42,7 +42,7 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) {
 
                invitation = meshlink_invite(mesh, arg);
                if(!invitation) {
-                       fprintf(stderr, "Could not invite '%s': %s\n", arg, mesh->errstr);
+                       fprintf(stderr, "Could not invite '%s': %s\n", arg, meshlink_strerror(meshlink_errno));
                        return;
                }
 
@@ -55,7 +55,7 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) {
                }
 
                if(!meshlink_join(mesh, arg))
-                       fprintf(stderr, "Could not join using invitation: %s\n", mesh->errstr);
+                       fprintf(stderr, "Could not join using invitation: %s\n", meshlink_strerror(meshlink_errno));
                else
                        fprintf(stderr, "Invitation accepted!\n");
        } else if(!strcasecmp(buf, "kick")) {
@@ -164,7 +164,7 @@ static void parse_input(meshlink_handle_t *mesh, char *buf) {
        }
 
        if(!meshlink_send(mesh, destination, msg, strlen(msg) + 1)) {
-               fprintf(stderr, "Could not send message to '%s': %s\n", destination->name, mesh->errstr);
+               fprintf(stderr, "Could not send message to '%s': %s\n", destination->name, meshlink_strerror(meshlink_errno));
                return;
        }
 
@@ -193,7 +193,7 @@ int main(int argc, char *argv[]) {
        meshlink_set_log_cb(mesh, MESHLINK_INFO, log_message);
 
        if(!meshlink_start(mesh)) {
-               fprintf(stderr, "Could not start MeshLink: %s\n", mesh->errstr);
+               fprintf(stderr, "Could not start MeshLink: %s\n", meshlink_strerror(meshlink_errno));
                return 1;
        }
 

diff --git a/examples/chatpp.cc b/examples/chatpp.cc
index 864a3e809b7258d20f8dcc7dcf561d3bb4c1d4aa..73ced3c6a2c0f67c7ffbc1a2ff0c054306b12541 100644 (file)
--- a/examples/chatpp.cc
+++ b/examples/chatpp.cc
@@ -42,7 +42,7 @@ static void parse_command(meshlink::mesh *mesh, char *buf) {
 
                invitation = mesh->invite(arg);
                if(!invitation) {
-                       fprintf(stderr, "Could not invite '%s': %s\n", arg, mesh->errstr);
+                       fprintf(stderr, "Could not invite '%s': %s\n", arg, meshlink::strerror());
                        return;
                }
 
@@ -55,7 +55,7 @@ static void parse_command(meshlink::mesh *mesh, char *buf) {
                }
 
                if(!mesh->join(arg))
-                       fprintf(stderr, "Could not join using invitation: %s\n", mesh->errstr);
+                       fprintf(stderr, "Could not join using invitation: %s\n", meshlink::strerror());
                else
                        fprintf(stderr, "Invitation accepted!\n");
        } else if(!strcasecmp(buf, "kick")) {
@@ -81,7 +81,7 @@ static void parse_command(meshlink::mesh *mesh, char *buf) {
                                fprintf(stderr, "No nodes known!\n");
                        } else {
                                printf("Known nodes:");
-                               for(int i = 0; i < n && i < 100; i++)
+                               for(size_t i = 0; i < n && i < 100; i++)
                                        printf(" %s", nodes[i]->name);
                                if(n > 100)
                                        printf(" (and %zu more)", n - 100);
@@ -164,7 +164,7 @@ static void parse_input(meshlink::mesh *mesh, char *buf) {
        }
 
        if(!mesh->send(destination, msg, strlen(msg) + 1)) {
-               fprintf(stderr, "Could not send message to '%s': %s\n", destination->name, mesh->errstr);
+               fprintf(stderr, "Could not send message to '%s': %s\n", destination->name, meshlink::strerror());
                return;
        }
 
@@ -193,7 +193,7 @@ int main(int argc, char *argv[]) {
        mesh->set_log_cb(MESHLINK_INFO, log_message);
 
        if(!mesh->start()) {
-               fprintf(stderr, "Could not start MeshLink: %s\n", mesh->errstr);
+               fprintf(stderr, "Could not start MeshLink: %s\n", meshlink::strerror());
                return 1;
        }
 

diff --git a/src/meshlink++.h b/src/meshlink++.h
index c8bdc2f9aa5cfd4ff2ce3b87236fda0dd8eac444..a357cca6516e24d96c0e13e23c7f570b6305b545 100644 (file)
--- a/src/meshlink++.h
+++ b/src/meshlink++.h
@@ -387,6 +387,10 @@ namespace meshlink {
        static void close(mesh *mesh) {
                meshlink_close(mesh);
        }
+
+       static const char *strerror(errno_t err = meshlink_errno) {
+               return meshlink_strerror(err);
+       }
 };
 
 #endif // MESHLINKPP_H

diff --git a/src/meshlink.c b/src/meshlink.c
index 23fe1dc4198335b5d4fe901482f7ecbf638ae09c..6d6b77f9707c72f5ee0e31aa8a4af82d7c2d07a0 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -44,6 +44,8 @@ typedef struct {
 #define MSG_NOSIGNAL 0
 #endif
 
+__thread meshlink_errno_t meshlink_errno;
+
 //TODO: this can go away completely
 const var_t variables[] = {
        /* Server configuration */

diff --git a/src/meshlink.h b/src/meshlink.h
index b54e961e5c9adab0bf6b144e2a527ad34f558511..018ba9a3efa549341ef6123933046d84732613c2 100644 (file)
--- a/src/meshlink.h
+++ b/src/meshlink.h
@@ -48,11 +48,12 @@ typedef enum {
        MESHLINK_ENOENT, ///< Node is not known
 } meshlink_errno_t;
 
+/// A variable holding the last encountered error from MeshLink.
+extern __thread meshlink_errno_t meshlink_errno;
+
 #ifndef MESHLINK_INTERNAL_H
 
 struct meshlink_handle {
-       meshlink_errno_t meshlink_errno; ///< Code of the last encountered error.
-       const char *errstr;              ///< Textual representation of most recent error encountered.
 };
 
 struct meshlink_node {