Merged branch 'master' of git://git.tokkee.org/sysdb.git.

[sysdb.git] / src / include / core / store.h

diff --git a/src/include/core/store.h b/src/include/core/store.h
index 6bda96783763f2e0234a5eb089857ed40acc23ff..7cdfbf0576671a2e119f2fa78d28201deb77680d 100644 (file)
--- a/src/include/core/store.h
+++ b/src/include/core/store.h
@@ -39,22 +39,28 @@
 extern "C" {
 #endif
 
+extern const sdb_type_t sdb_host_type;
+extern const sdb_type_t sdb_attribute_type;
+extern const sdb_type_t sdb_service_type;
+
 typedef struct {
        sdb_object_t parent;
 
        sdb_time_t last_update;
        char *name;
 } sdb_store_obj_t;
-#define SDB_STORE_OBJ_INIT { SDB_OBJECT_INIT, 0, NULL }
+#define SDB_STORE_OBJ_INIT(t) { SDB_OBJECT_TYPED_INIT(t), 0, NULL }
 #define SDB_STORE_OBJ(obj) ((sdb_store_obj_t *)(obj))
+#define SDB_CONST_STORE_OBJ(obj) ((const sdb_store_obj_t *)(obj))
 
 typedef struct {
        sdb_store_obj_t parent;
 
        char *hostname;
 } sdb_service_t;
-#define SDB_SVC_INIT { SDB_STORE_OBJ_INIT, NULL }
+#define SDB_SVC_INIT { SDB_STORE_OBJ_INIT(sdb_service_type), NULL }
 #define SDB_SVC(obj) ((sdb_service_t *)(obj))
+#define SDB_CONST_SVC(obj) ((const sdb_service_t *)(obj))
 
 typedef struct {
        sdb_store_obj_t parent;
@@ -62,8 +68,9 @@ typedef struct {
        char *attr_value;
        char *hostname;
 } sdb_attribute_t;
-#define SDB_ATTR_INIT { SDB_STORE_OBJ_INIT, NULL, NULL }
+#define SDB_ATTR_INIT { SDB_STORE_OBJ_INIT(sdb_attribute_type), NULL, NULL }
 #define SDB_ATTR(obj) ((sdb_attribute_t *)(obj))
+#define SDB_CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
 
 typedef struct {
        sdb_store_obj_t parent;
@@ -71,8 +78,9 @@ typedef struct {
        sdb_llist_t *attributes;
        sdb_llist_t *services;
 } sdb_host_t;
-#define SDB_HOST_INIT { SDB_STORE_OBJ_INIT, NULL, NULL }
+#define SDB_HOST_INIT { SDB_STORE_OBJ_INIT(sdb_host_type), NULL, NULL }
 #define SDB_HOST(obj) ((sdb_host_t *)(obj))
+#define SDB_CONST_HOST(obj) ((const sdb_host_t *)(obj))
 
 /* shortcuts for accessing the sdb_store_obj_t attributes of inheriting
  * objects */
@@ -82,9 +90,6 @@ typedef struct {
 sdb_host_t *
 sdb_host_create(const char *name);
 
-sdb_host_t *
-sdb_host_clone(const sdb_host_t *host);
-
 /*
  * sdb_store_host:
  * Add/update a host in the store. If the host, identified by its name,
@@ -109,9 +114,6 @@ sdb_attribute_t *
 sdb_attribute_create(const char *hostname,
                const char *name, const char *value);
 
-sdb_attribute_t *
-sdb_attribute_clone(const sdb_attribute_t *attr);
-
 /*
  * sdb_store_attribute:
  * Add/update a host's attribute in the store. If the attribute, identified by
@@ -134,9 +136,6 @@ sdb_store_attribute(const sdb_attribute_t *attr);
 sdb_service_t *
 sdb_service_create(const char *hostname, const char *name);
 
-sdb_service_t *
-sdb_service_clone(const sdb_service_t *svc);
-
 /*
  * sdb_store_service:
  * Add/update a store in the store. If the service, identified by its name,