X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fobject.c;h=9101918654379a1ff41491df64187d399468d186;hb=3970ba2a54fdf360d425452d0d29f6cd3c09915a;hp=d6665e7cbd7546645093d0d97c68136dc17ed8a0;hpb=e97728dc23dba720769eed4de91b7fd293f40e47;p=sysdb.git

diff --git a/src/core/object.c b/src/core/object.c
index d6665e7..9101918 100644
--- a/src/core/object.c
+++ b/src/core/object.c
@@ -25,6 +25,10 @@
  * 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>
@@ -66,8 +70,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
 };
 
 /*
@@ -79,13 +82,14 @@ 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);
@@ -104,7 +108,6 @@ sdb_object_vcreate(const char *name, sdb_type_t type, va_list ap)
 		}
 	}
 
-	obj->type = type;
 	obj->ref_cnt = 1;
 	return obj;
 } /* sdb_object_vcreate */
@@ -121,6 +124,14 @@ sdb_object_create(const char *name, sdb_type_t type, ...)
 	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 *))
@@ -155,14 +166,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)
 {