X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Finclude%2Fcore%2Fstore.h;h=538390afb3d69d24aaf7cce07fa38c689a36840a;hb=73272856dba3b5e49710205601017724fbb6c424;hp=3c2b7a8e201d21eecf08da5836696844f8e3c184;hpb=bef7167f0dc1fd405e35d5cbffb3c0820945a9ea;p=sysdb.git

diff --git a/src/include/core/store.h b/src/include/core/store.h
index 3c2b7a8..538390a 100644
--- 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,60 +39,13 @@
 extern "C" {
 #endif
 
-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(obj) ((sdb_store_obj_t *)(obj))
-
-typedef struct {
-	sdb_store_obj_t parent;
-#define svc_last_update parent.last_update
-#define svc_name parent.name
-
-	char *hostname;
-} sdb_service_t;
-#define SDB_SVC_INIT { SDB_STORE_OBJ_INIT, NULL }
-#define SDB_SVC(obj) ((sdb_service_t *)(obj))
-
-typedef struct {
-	sdb_store_obj_t parent;
-#define attr_last_update parent.last_update
-#define attr_name parent.name
-
-	char *attr_value;
-	char *hostname;
-} sdb_attribute_t;
-#define SDB_ATTR_INIT { SDB_STORE_OBJ_INIT, NULL, NULL }
-#define SDB_ATTR(obj) ((sdb_attribute_t *)(obj))
-
-typedef struct {
-	sdb_store_obj_t parent;
-#define host_last_update parent.last_update
-#define host_name parent.name
-
-	sdb_llist_t *attributes;
-	sdb_llist_t *services;
-} sdb_host_t;
-#define SDB_HOST_INIT { SDB_STORE_OBJ_INIT, NULL, NULL }
-#define SDB_HOST(obj) ((sdb_host_t *)(obj))
-
-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,
- * already exists, it will be updated according to the specified 'host'
- * object. Else, a new entry will be created in the store. Any memory required
- * for storing the entry will be allocated an managed by the store itself. The
- * specified host-object will not be referenced or further accessed.
+ * Add/update a host in the store. If the host, identified by its
+ * canonicalized name, already exists, it will be updated according to the
+ * specified name and timestamp. Else, a new entry will be created in the
+ * store. Any memory required for storing the entry will be allocated an
+ * managed by the store itself.
  *
  * Returns:
  *  - 0 on success
@@ -101,27 +54,19 @@ sdb_host_clone(const sdb_host_t *host);
  *  - a negative value on error
  */
 int
-sdb_store_host(const sdb_host_t *host);
-
-const sdb_host_t *
-sdb_store_get_host(const char *name);
-
-sdb_attribute_t *
-sdb_attribute_create(const char *hostname,
-		const char *name, const char *value);
+sdb_store_host(const char *name, sdb_time_t last_update);
 
-sdb_attribute_t *
-sdb_attribute_clone(const sdb_attribute_t *attr);
+_Bool
+sdb_store_has_host(const char *name);
 
 /*
  * sdb_store_attribute:
  * Add/update a host's attribute in the store. If the attribute, identified by
- * its name, already exists for the specified host, it will be updated
- * according to the specified 'attr' object. If the referenced host does not
- * exist, an error will be reported. Else, a new entry will be created in the
- * store. Any memory required for storing the entry will be allocated and
- * managed by the store itself. The specified attribute-object will not be
- * referenced or further accessed.
+ * its key, already exists for the specified host, it will be updated to the
+ * specified values. If the referenced host does not exist, an error will be
+ * reported. Else, a new entry will be created in the store. Any memory
+ * required for storing the entry will be allocated and managed by the store
+ * itself.
  *
  * Returns:
  *  - 0 on success
@@ -130,13 +75,8 @@ sdb_attribute_clone(const sdb_attribute_t *attr);
  *  - a negative value on error
  */
 int
-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_attribute(const char *hostname, const char *key, const char *value,
+		sdb_time_t last_update);
 
 /*
  * sdb_store_service:
@@ -155,10 +95,8 @@ sdb_service_clone(const sdb_service_t *svc);
  *  - a negative value on error
  */
 int
-sdb_store_service(const sdb_service_t *svc);
-
-const sdb_service_t *
-sdb_store_get_service(const sdb_host_t *host, const char *name);
+sdb_store_service(const char *hostname, const char *name,
+		sdb_time_t last_update);
 
 int
 sdb_store_dump(FILE *fh);