Temporarily add a global meshlink_handle_t *mesh.

This helps keeping the compiler happy while we refactor the global variables
into meshlink_handle_t one by one.

diff --git a/src/meshlink.c b/src/meshlink.c
index d9da584aadf9b75c6c254eac73317c5cf475225f..6fe57c024e9d0f1b8278c665a0056cc5f2654a3f 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -33,7 +33,13 @@ const char *meshlink_strerror(meshlink_errno_t errno) {
        return errstr[errno];
 }
 
+// TODO: hack, remove once all global variables are gone.
+static void set_mesh(meshlink_handle_t *localmesh) {
+       mesh = localmesh;
+}
+
 static meshlink_handle_t *meshlink_setup(meshlink_handle_t *mesh) {
+       set_mesh(mesh);
        return mesh;
 }
 
@@ -111,6 +117,7 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
                return meshlink_close(mesh), NULL;
        }
 
+       set_mesh(mesh);
        return mesh;
 }
 

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index fa1017d065538efe9634d26426aeb8e95609c6b7..a41fa09bbc78895e06d512371cbf6c3ab9f5edff 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -52,4 +52,10 @@ struct meshlink_node {
        void *priv;
 };
 
+// This is a *temporary* global variable which will keep the compiler happy
+// while refactoring the code to get rid of global variables.
+// TODO: remove this when no other global variables remain.
+
+extern meshlink_handle_t *mesh;
+
 #endif // MESHLINK_INTERNAL_H