index dce562c42fbb697865a4eab0dc1f5f5ead143b08..2f6470e01c8ee5350b75a7300029e88162b759a3 100644 (file)
int (*init)(sdb_object_t *, va_list);
void (*destroy)(sdb_object_t *);
int (*init)(sdb_object_t *, va_list);
void (*destroy)(sdb_object_t *);
- sdb_object_t *(*clone)(const sdb_object_t *);
};
};
-#define SDB_TYPE_INIT { 0, NULL, NULL, NULL }
+#define SDB_TYPE_INIT { 0, NULL, NULL }
struct sdb_object {
sdb_type_t type;
int ref_cnt;
struct sdb_object {
sdb_type_t type;
int ref_cnt;
+ char *name;
};
};
-#define SDB_OBJECT_INIT { SDB_TYPE_INIT, 1 }
+#define SDB_OBJECT_INIT { SDB_TYPE_INIT, 1, NULL }
+#define SDB_OBJECT_TYPED_INIT(t) { (t), 1, NULL }
typedef struct {
sdb_object_t super;
typedef struct {
sdb_object_t super;
} sdb_object_wrapper_t;
#define SDB_OBJ(obj) ((sdb_object_t *)(obj))
} sdb_object_wrapper_t;
#define SDB_OBJ(obj) ((sdb_object_t *)(obj))
+#define SDB_CONST_OBJ(obj) ((const sdb_object_t *)(obj))
#define SDB_OBJ_WRAPPER(obj) ((sdb_object_wrapper_t *)(obj))
#define SDB_OBJ_WRAPPER(obj) ((sdb_object_wrapper_t *)(obj))
+#define SDB_CONST_OBJ_WRAPPER(obj) ((const sdb_object_wrapper_t *)(obj))
/*
* sdb_object_create:
/*
* sdb_object_create:
- * Allocates a new sdb_object_t of the specified 'type'. The object will be
- * initialized to zero and then passed on to the 'init' function (if
+ * Allocates a new sdb_object_t of the specified 'name' and 'type'. The object
+ * will be initialized to zero and then passed on to the 'init' function (if
* specified). If specified, the 'destroy' callback will be called, when the
* reference count drops to zero and before freeing the memory allocated by
* the object itself.
*
* The init function will be called with the remaining arguments passed to
* sdb_object_create. If the init function fails (returns a non-zero value),
* specified). If specified, the 'destroy' callback will be called, when the
* reference count drops to zero and before freeing the memory allocated by
* the object itself.
*
* The init function will be called with the remaining arguments passed to
* sdb_object_create. If the init function fails (returns a non-zero value),
- * the object will be destructed and destroyed.
+ * the object will be destructed and destroyed. In this case, the 'destroy'
+ * callback may be called on objects that were only half-way initialized. The
+ * callback has to handle that case correctly.
*
* The reference count of the new object will be 1.
*
*
* The reference count of the new object will be 1.
*
* - NULL on error
*/
sdb_object_t *
* - NULL on error
*/
sdb_object_t *
-sdb_object_create(sdb_type_t type, ...);
+sdb_object_create(const char *name, sdb_type_t type, ...);
+sdb_object_t *
+sdb_object_vcreate(const char *name, sdb_type_t type, va_list ap);
+
+/*
+ * sdb_object_create_simple:
+ * Create a "simple" object without custom initialization and destructor.
+ * See the description of sdb_object_create for more details.
+ */
+sdb_object_t *
+sdb_object_create_simple(const char *name, size_t size);
+
+/*
+ * sdb_object_create_T:
+ * Create a simple object of type 't'.
+ */
+#define sdb_object_create_T(n,t) sdb_object_create_simple((n), sizeof(t))
/*
* sdb_object_create_wrapper:
/*
* sdb_object_create_wrapper:
* of the SysDB object system.
*/
sdb_object_t *
* of the SysDB object system.
*/
sdb_object_t *
-sdb_object_create_wrapper(void *data, void (*destructor)(void *));
+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, destructor) \
{ SDB_OBJECT_INIT, (obj), (destructor) }
sdb_object_ref(sdb_object_t *obj);
/*
sdb_object_ref(sdb_object_t *obj);
/*
- * sdb_object_clone:
- * Clone an existing object using its type's 'clone' callback. The callback is
- * responsible for correctly initializing a new object (which may be done
- * using the object create function or the object's type's init function).
+ * sdb_object_cmp_by_name:
+ * Compare two objects by their name ignoring the case of the characters.
*
* Returns:
*
* Returns:
- * - the cloned object on success
- * - NULL on error or if no clone callback is available
+ * - a negative value if o1 compares less than o2
+ * - zero if o1 matches o2
+ * - a positive value if o1 compares greater than o2
*/
*/
-sdb_object_t *
-sdb_object_clone(const sdb_object_t *obj);
+int
+sdb_object_cmp_by_name(const sdb_object_t *o1, const sdb_object_t *o2);
#ifdef __cplusplus
} /* extern "C" */
#ifdef __cplusplus
} /* extern "C" */