object: Static wrapper objects cannot have a destructor.

We cannot free the static memory and, thus, cannot destroy the object.

diff --git a/src/backend/collectd/unixsock.c b/src/backend/collectd/unixsock.c
index 7145e9d2dc45c387fade499c992428286ce2efac..b8bbbfe63c29fb638f5ceb5ede65f73b83126751 100644 (file)
--- a/src/backend/collectd/unixsock.c
+++ b/src/backend/collectd/unixsock.c
@@ -261,8 +261,7 @@ sdb_collectd_collect(sdb_object_t *user_data)
        long int count;
 
        sdb_collectd_state_t state = SDB_COLLECTD_STATE_INIT;
-       sdb_object_wrapper_t state_obj = SDB_OBJECT_WRAPPER_STATIC(&state,
-                       /* destructor = */ NULL);
+       sdb_object_wrapper_t state_obj = SDB_OBJECT_WRAPPER_STATIC(&state);
 
        if (! user_data)
                return -1;

diff --git a/src/include/core/object.h b/src/include/core/object.h
index 42352b085876b48cbbaca7716670d05c4bc06d14..a92fb53945676f65fbbada4bfe4f680d22427093 100644 (file)
--- a/src/include/core/object.h
+++ b/src/include/core/object.h
@@ -133,8 +133,8 @@ sdb_object_t *
 sdb_object_create_wrapper(const char *name,
                void *data, void (*destructor)(void *));
 
-#define SDB_OBJECT_WRAPPER_STATIC(obj, destructor) \
-       { SDB_OBJECT_INIT, (obj), (destructor) }
+#define SDB_OBJECT_WRAPPER_STATIC(obj) \
+       { SDB_OBJECT_INIT, (obj), /* destructor */ NULL }
 
 /*
  * sdb_object_deref: