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

diff --git a/src/include/core/store.h b/src/include/core/store.h
index 143fa7e..538390a 100644
--- a/src/include/core/store.h
+++ b/src/include/core/store.h
@@ -39,51 +39,6 @@
 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_host:
  * Add/update a host in the store. If the host, identified by its
@@ -107,12 +62,11 @@ 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
@@ -121,10 +75,8 @@ sdb_store_has_host(const char *name);
  *  - 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_store_attribute(const char *hostname, const char *key, const char *value,
+		sdb_time_t last_update);
 
 /*
  * sdb_store_service:
@@ -143,10 +95,8 @@ sdb_service_create(const char *hostname, const char *name);
  *  - 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);