store: Split store_obj into separate host and service objects.

[sysdb.git] / src / core / store-private.h

diff --git a/src/core/store-private.h b/src/core/store-private.h
index 49ddaf547465f349b8ba57aede974e0388628652..603648ca057b51ced94b5a7ecd05bdadd615acbc 100644 (file)
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -60,20 +60,27 @@ typedef struct {
 
        sdb_data_t value;
 } sdb_attribute_t;
-#define SDB_ATTR(obj) ((sdb_attribute_t *)(obj))
-#define SDB_CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
+#define ATTR(obj) ((sdb_attribute_t *)(obj))
+#define CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
 
 typedef struct {
        sdb_store_base_t super;
 
-       sdb_llist_t *children;
        sdb_llist_t *attributes;
-} sdb_store_obj_t;
-#define SDB_STORE_OBJ(obj) ((sdb_store_obj_t *)(obj))
-#define SDB_CONST_STORE_OBJ(obj) ((const sdb_store_obj_t *)(obj))
+} sdb_service_t;
+#define SVC(obj) ((sdb_service_t *)(obj))
+#define CONST_SVC(obj) ((const sdb_service_t *)(obj))
 
-/* shortcuts for accessing the sdb_store_obj_t attributes
- * of inheriting objects */
+typedef struct {
+       sdb_store_base_t super;
+
+       sdb_llist_t *services;
+       sdb_llist_t *attributes;
+} sdb_host_t;
+#define HOST(obj) ((sdb_host_t *)(obj))
+#define CONST_HOST(obj) ((const sdb_host_t *)(obj))
+
+/* shortcuts for accessing service/host attributes */
 #define _last_update super.last_update
 #define _interval super.interval
 
@@ -174,8 +181,6 @@ typedef struct {
 typedef struct {
        sdb_store_matcher_t super;
        char *name;
-       /* XXX: this needs to be more flexible;
-        *      add support for type-specific operators */
        string_matcher_t value;
 } attr_matcher_t;
 #define ATTR_M(m) ((attr_matcher_t *)(m))