X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fobject.c;h=c39faf4aed2c89f684a3e2c0c947b0eba7fe2d18;hb=2faa3926a2836c0fe560bc73c7a8df4b9993b3be;hp=5ebcff213d827fdb0404e8d7a505ae3c0fcfc9f4;hpb=bef7167f0dc1fd405e35d5cbffb3c0820945a9ea;p=sysdb.git

diff --git a/src/core/object.c b/src/core/object.c
index 5ebcff2..c39faf4 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>
@@ -33,7 +37,7 @@
 #include <string.h>
 
 /*
- * private helper functions
+ * private types
  */
 
 static int
@@ -62,47 +66,77 @@ sdb_object_wrapper_destroy(sdb_object_t *obj)
 	SDB_OBJ_WRAPPER(obj)->data = NULL;
 } /* sdb_object_wrapper_destroy */
 
+static sdb_type_t sdb_object_wrapper_type = {
+	sizeof(sdb_object_wrapper_t),
+
+	sdb_object_wrapper_init,
+	sdb_object_wrapper_destroy
+};
+
 /*
  * public API
  */
 
 sdb_object_t *
-sdb_object_create(size_t size, int (*init)(sdb_object_t *, va_list),
-		void (*destructor)(sdb_object_t *), ...)
+sdb_object_vcreate(const char *name, sdb_type_t type, va_list ap)
 {
 	sdb_object_t *obj;
 
-	obj = malloc(size);
-	if (! obj)
+	if (type.size < sizeof(sdb_object_t))
 		return NULL;
-	memset(obj, 0, sizeof(*obj));
 
-	if (init) {
-		va_list ap;
-		va_start(ap, destructor);
+	obj = malloc(type.size);
+	if (! obj)
+		return NULL;
+	memset(obj, 0, type.size);
+	obj->type = type;
 
-		if (init(obj, ap)) {
+	if (name) {
+		obj->name = strdup(name);
+		if (! obj->name) {
 			obj->ref_cnt = 1;
 			sdb_object_deref(obj);
-			va_end(ap);
 			return NULL;
 		}
+	}
 
-		va_end(ap);
+	if (type.init) {
+		if (type.init(obj, ap)) {
+			obj->ref_cnt = 1;
+			sdb_object_deref(obj);
+			return NULL;
+		}
 	}
 
 	obj->ref_cnt = 1;
-	obj->destructor = destructor;
-	obj->size = size;
+	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_wrapper(void *data, void (*destructor)(void *))
+sdb_object_create_simple(const char *name, size_t size,
+		void (*destructor)(sdb_object_t *))
 {
-	return sdb_object_create(sizeof(sdb_object_wrapper_t),
-			sdb_object_wrapper_init, sdb_object_wrapper_destroy,
-			data, destructor);
+	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 *))
+{
+	return sdb_object_create(name, sdb_object_wrapper_type, data, destructor);
 } /* sdb_object_create_wrapper */
 
 void
@@ -115,9 +149,14 @@ sdb_object_deref(sdb_object_t *obj)
 	if (obj->ref_cnt > 0)
 		return;
 
-	if (obj->destructor)
-		obj->destructor(obj);
+	/* we'd access free'd memory in case ref_cnt < 0 */
+	assert(! obj->ref_cnt);
+
+	if (obj->type.destroy)
+		obj->type.destroy(obj);
 
+	if (obj->name)
+		free(obj->name);
 	free(obj);
 } /* sdb_object_deref */
 
@@ -130,5 +169,18 @@ sdb_object_ref(sdb_object_t *obj)
 	++obj->ref_cnt;
 } /* sdb_object_ref */
 
+int
+sdb_object_cmp_by_name(const sdb_object_t *o1, const sdb_object_t *o2)
+{
+	if ((! o1) && (! o2))
+		return 0;
+	else if (! o1)
+		return -1;
+	else if (! o2)
+		return 1;
+
+	return strcasecmp(o1->name, o2->name);
+} /* sdb_object_cmp_by_name */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */