2nd approach again: class meshlink::mesh has the handle as member, not as base class.

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index 6ebbdcb0aab4481f62d1a368c488f3f7176f823a..df695b15fa9855a6c5ab9bbee668b39b56cb0fc6 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -758,11 +758,6 @@ static bool meshlink_setup(meshlink_handle_t *mesh) {
 }
 
 meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const char* appname, dev_class_t devclass) {
-       return meshlink_open_with_size(confbase, name, appname, devclass, sizeof(meshlink_handle_t));
-}
-
-meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *name, const char* appname, dev_class_t devclass, size_t size) {
-
        // Validate arguments provided by the application
        bool usingname = false;
        
@@ -799,7 +794,7 @@ meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *nam
                return NULL;
        }
 
-       meshlink_handle_t *mesh = xzalloc(size);
+       meshlink_handle_t *mesh = xzalloc(sizeof(meshlink_handle_t));
        mesh->confbase = xstrdup(confbase);
        mesh->appname = xstrdup(appname);
        mesh->devclass = devclass;