store_json: Base the memstore emitter on the store-writer API.

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

diff --git a/src/core/store-private.h b/src/core/store-private.h
index 700fed60ff723f4e60bd986bff75df9c805fe4aa..e8514879c1e8ba43ad5af1ec89791a09452357e0 100644 (file)
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -48,6 +48,7 @@ extern "C" {
 
 struct sdb_store_obj {
        sdb_object_t super;
+#define _name super.name
 
        /* object type */
        int type;
@@ -66,17 +67,17 @@ typedef struct {
        sdb_store_obj_t super;
 
        sdb_data_t value;
-} sdb_attribute_t;
-#define ATTR(obj) ((sdb_attribute_t *)(obj))
-#define CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
+} attr_t;
+#define ATTR(obj) ((attr_t *)(obj))
+#define CONST_ATTR(obj) ((const attr_t *)(obj))
 
 typedef struct {
        sdb_store_obj_t super;
 
        sdb_avltree_t *attributes;
-} sdb_service_t;
-#define SVC(obj) ((sdb_service_t *)(obj))
-#define CONST_SVC(obj) ((const sdb_service_t *)(obj))
+} service_t;
+#define SVC(obj) ((service_t *)(obj))
+#define CONST_SVC(obj) ((const service_t *)(obj))
 
 typedef struct {
        sdb_store_obj_t super;
@@ -95,9 +96,9 @@ typedef struct {
        sdb_avltree_t *services;
        sdb_avltree_t *metrics;
        sdb_avltree_t *attributes;
-} sdb_host_t;
-#define HOST(obj) ((sdb_host_t *)(obj))
-#define CONST_HOST(obj) ((const sdb_host_t *)(obj))
+} host_t;
+#define HOST(obj) ((host_t *)(obj))
+#define CONST_HOST(obj) ((const host_t *)(obj))
 
 /* shortcuts for accessing service/host attributes */
 #define _last_update super.last_update