X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Finclude%2Fcore%2Fstore.h;h=5558e77154f32f00e9d59edf75ea3d1f0a014119;hb=96c2e44dd67bf91a246659347e9d5eb4e0c075da;hp=af8e23cff6a390ce74a9f354b8f38a672b70d5e1;hpb=d2dfea6b174f94b1d3a76d693d9736182e4a5f33;p=sysdb.git

diff --git a/src/include/core/store.h b/src/include/core/store.h
index af8e23c..5558e77 100644
--- a/src/include/core/store.h
+++ b/src/include/core/store.h
@@ -32,6 +32,7 @@
 #include "core/object.h"
 #include "core/time.h"
 #include "utils/llist.h"
+#include "utils/strbuf.h"
 
 #include <stdio.h>
 
@@ -39,50 +40,13 @@
 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 super;
-	sdb_time_t last_update;
-} sdb_store_obj_t;
-#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 super;
-
-	char *hostname;
-} sdb_service_t;
-#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 super;
-
-	char *attr_value;
-	char *hostname;
-} sdb_attribute_t;
-#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 super;
-
-	sdb_llist_t *attributes;
-	sdb_llist_t *services;
-} sdb_host_t;
-#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 super.last_update
+/*
+ * sdb_store_base_t represents the super-class of any object stored in the
+ * database. It inherits from sdb_object_t and may safely be cast to a generic
+ * object to access its name.
+ */
+struct sdb_store_base;
+typedef struct sdb_store_base sdb_store_base_t;
 
 /*
  * sdb_store_host:
@@ -143,8 +107,17 @@ int
 sdb_store_service(const char *hostname, const char *name,
 		sdb_time_t last_update);
 
+/*
+ * sdb_store_tojson:
+ * Serialize the entire store to JSON and append the result to the specified
+ * buffer.
+ *
+ * Returns:
+ *  - 0 on success
+ *  - a negative value on error
+ */
 int
-sdb_store_dump(FILE *fh);
+sdb_store_tojson(sdb_strbuf_t *buf);
 
 #ifdef __cplusplus
 } /* extern "C" */