Fix __warn_unused_result__, add more of it and fix the resulting warnings.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index ba7f7d155c4893cb28e6d6a5ccdc2a9a286a1333..5f87632c6c7742da92e0cc5620c3ac7259bbb9cc 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -94,7 +94,7 @@ struct meshlink_handle {
        void *priv;
 
        // private members
-       pthread_mutex_t mesh_mutex;
+       pthread_mutex_t mutex;
        event_loop_t loop;
        struct node_t *self;
        meshlink_log_cb_t log_cb;
@@ -133,6 +133,7 @@ struct meshlink_handle {
 
        struct connection_t *everyone;
        uint64_t prng_state[4];
+       uint32_t session_id;
 
        int next_pit;
        int pits[10];
@@ -168,7 +169,7 @@ struct meshlink_handle {
 
        // Configuration
        char *confbase;
-       FILE *conffile;
+       FILE *lockfile;
        void *config_key;
 
        // Thread management
@@ -258,7 +259,7 @@ extern meshlink_log_level_t global_log_level;
 extern meshlink_log_cb_t global_log_cb;
 extern void handle_duplicate_node(meshlink_handle_t *mesh, struct node_t *n);
 extern void handle_network_change(meshlink_handle_t *mesh, bool online);
-extern void call_error_cb(meshlink_handle_t *mesh);
+extern void call_error_cb(meshlink_handle_t *mesh, meshlink_errno_t meshlink_errno);
 
 /// Per-instance PRNG
 static inline int prng(meshlink_handle_t *mesh, uint64_t max) {