X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fobject.c;h=dfa06551cb62c1353b59d827ea5333c8e7f30187;hp=7fbd5f025228831503fdc626516f3c9733eeff81;hb=6f29ec3901a06ae905c818b882a80f8a0bd7af42;hpb=1fee763a36a0c9af761244bbce8cd6c233ddbe2a

diff --git a/src/core/object.c b/src/core/object.c
index 7fbd5f0..dfa0655 100644
--- a/src/core/object.c
+++ b/src/core/object.c
@@ -25,12 +25,17 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#	include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "core/object.h"
 
 #include <assert.h>
 
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 /*
  * private types
@@ -66,8 +71,7 @@ static sdb_type_t sdb_object_wrapper_type = {
 	sizeof(sdb_object_wrapper_t),
 
 	sdb_object_wrapper_init,
-	sdb_object_wrapper_destroy,
-	/* clone = */ NULL
+	sdb_object_wrapper_destroy
 };
 
 /*
@@ -75,17 +79,18 @@ static sdb_type_t sdb_object_wrapper_type = {
  */
 
 sdb_object_t *
-sdb_object_create(const char *name, sdb_type_t type, ...)
+sdb_object_vcreate(const char *name, sdb_type_t type, va_list ap)
 {
 	sdb_object_t *obj;
 
-	if (type.size <= sizeof(sdb_object_t))
+	if (type.size < sizeof(sdb_object_t))
 		return NULL;
 
 	obj = malloc(type.size);
 	if (! obj)
 		return NULL;
 	memset(obj, 0, type.size);
+	obj->type = type;
 
 	if (name) {
 		obj->name = strdup(name);
@@ -97,24 +102,37 @@ sdb_object_create(const char *name, sdb_type_t type, ...)
 	}
 
 	if (type.init) {
-		va_list ap;
-		va_start(ap, type);
-
 		if (type.init(obj, ap)) {
 			obj->ref_cnt = 1;
 			sdb_object_deref(obj);
-			va_end(ap);
 			return NULL;
 		}
-
-		va_end(ap);
 	}
 
-	obj->type = type;
 	obj->ref_cnt = 1;
 	return obj;
+} /* sdb_object_vcreate */
+
+sdb_object_t *
+sdb_object_create(const char *name, sdb_type_t type, ...)
+{
+	sdb_object_t *obj;
+	va_list ap;
+
+	va_start(ap, type);
+	obj = sdb_object_vcreate(name, type, ap);
+	va_end(ap);
+	return obj;
 } /* sdb_object_create */
 
+sdb_object_t *
+sdb_object_create_simple(const char *name, size_t size,
+		void (*destructor)(sdb_object_t *))
+{
+	sdb_type_t t = { size, NULL, destructor };
+	return sdb_object_create(name, t);
+} /* sdb_object_create_simple */
+
 sdb_object_t *
 sdb_object_create_wrapper(const char *name,
 		void *data, void (*destructor)(void *))
@@ -132,6 +150,9 @@ sdb_object_deref(sdb_object_t *obj)
 	if (obj->ref_cnt > 0)
 		return;
 
+	/* we'd access free'd memory in case ref_cnt < 0 */
+	assert(! obj->ref_cnt);
+
 	if (obj->type.destroy)
 		obj->type.destroy(obj);
 
@@ -149,14 +170,6 @@ sdb_object_ref(sdb_object_t *obj)
 	++obj->ref_cnt;
 } /* sdb_object_ref */
 
-sdb_object_t *
-sdb_object_clone(const sdb_object_t *obj)
-{
-	if ((! obj) || (! obj->type.clone))
-		return NULL;
-	return obj->type.clone(obj);
-} /* sdb_object_clone */
-
 int
 sdb_object_cmp_by_name(const sdb_object_t *o1, const sdb_object_t *o2)
 {