store: Renamed 'parent' attribute to 'super'.

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

diff --git a/src/include/core/store.h b/src/include/core/store.h
index 7e9c0dee21a056ee924d79f0ad8073e0b1418d40..fb79b39fe089cf58f00eb7b99b702cbaa06e077e 100644 (file)
--- a/src/include/core/store.h
+++ b/src/include/core/store.h
@@ -30,7 +30,7 @@
 
 #include "sysdb.h"
 #include "core/object.h"
-#include "utils/time.h"
+#include "core/time.h"
 #include "utils/llist.h"
 
 #include <stdio.h>
@@ -39,49 +39,50 @@
 extern "C" {
 #endif
 
-typedef struct {
-       sdb_object_t parent;
+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 super;
        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 }
 #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;
+       sdb_store_obj_t super;
 
        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;
+       sdb_store_obj_t super;
 
        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;
+       sdb_store_obj_t super;
 
        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 */
-#define _last_update parent.last_update
-#define _name parent.name
+#define _last_update super.last_update
 
 sdb_host_t *
 sdb_host_create(const char *name);