store: Let sdb_store_attribute() accept const arguments.

[sysdb.git] / src / core / store.c

diff --git a/src/core/store.c b/src/core/store.c
index a5f712ef72729636b1a4f9a3606bfc9b44b0a15a..e8a693ce0c268b228bab54e29614a49447517e6e 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -143,8 +143,8 @@ sdb_attr_clone(const sdb_object_t *obj)
        const sdb_attribute_t *attr = (const sdb_attribute_t *)obj;
        sdb_attribute_t *new;
 
-       new = sdb_attribute_create(attr->hostname,
-                       obj->name, attr->attr_value);
+       new = SDB_ATTR(sdb_object_create(obj->name, sdb_attribute_type,
+                               attr->hostname, attr->attr_value));
        if (! new)
                return NULL;
 
@@ -181,7 +181,8 @@ sdb_svc_clone(const sdb_object_t *obj)
        const sdb_service_t *svc = (const sdb_service_t *)obj;
        sdb_service_t *new;
 
-       new = sdb_service_create(svc->hostname, obj->name);
+       new = SDB_SVC(sdb_object_create(obj->name, sdb_service_type,
+                               svc->hostname));
        if (! new)
                return NULL;
 
@@ -310,8 +311,8 @@ sdb_store_host(const char *name, sdb_time_t last_update)
        return status;
 } /* sdb_store_host */
 
-const sdb_host_t *
-sdb_store_get_host(const char *name)
+_Bool
+sdb_store_has_host(const char *name)
 {
        sdb_host_t *host;
 
@@ -319,39 +320,21 @@ sdb_store_get_host(const char *name)
                return NULL;
 
        host = SDB_HOST(sdb_llist_search_by_name(host_list, name));
-       if (! host)
-               return NULL;
-       return host;
-} /* sdb_store_get_host */
-
-sdb_attribute_t *
-sdb_attribute_create(const char *hostname,
-               const char *name, const char *value)
-{
-       sdb_object_t *obj;
-
-       if ((! hostname) || (! name) || (! value))
-               return NULL;
-
-       obj = sdb_object_create(name, sdb_attribute_type, hostname, value);
-       if (! obj)
-               return NULL;
-       return SDB_ATTR(obj);
-} /* sdb_attribute_create */
+       return host != NULL;
+} /* sdb_store_has_host */
 
 int
-sdb_store_attribute(const sdb_attribute_t *attr)
+sdb_store_attribute(const char *hostname, const char *key, const char *value,
+               sdb_time_t last_update)
 {
        sdb_host_t *host;
        sdb_attribute_t *old;
-       sdb_time_t last_update;
 
        int status = 0;
 
-       if (! attr)
+       if ((! hostname) || (! key))
                return -1;
 
-       last_update = attr->_last_update;
        if (last_update <= 0)
                last_update = sdb_gettime();
 
@@ -360,20 +343,18 @@ sdb_store_attribute(const sdb_attribute_t *attr)
 
        pthread_rwlock_wrlock(&host_lock);
 
-       host = SDB_HOST(sdb_llist_search_by_name(host_list, attr->hostname));
+       host = SDB_HOST(sdb_llist_search_by_name(host_list, hostname));
        if (! host) {
                pthread_rwlock_unlock(&host_lock);
                return -1;
        }
 
-       old = SDB_ATTR(sdb_llist_search_by_name(host->attributes,
-                               SDB_CONST_OBJ(attr)->name));
+       old = SDB_ATTR(sdb_llist_search_by_name(host->attributes, key));
        if (old) {
                if (old->_last_update > last_update) {
                        sdb_log(SDB_LOG_DEBUG, "store: Cannot update attribute "
                                        "'%s/%s' - value too old (%"PRIscTIME" < %"PRIscTIME")",
-                                       attr->hostname, SDB_CONST_OBJ(attr)->name, last_update,
-                                       old->_last_update);
+                                       hostname, key, last_update, old->_last_update);
                        status = 1;
                }
                else {
@@ -381,7 +362,8 @@ sdb_store_attribute(const sdb_attribute_t *attr)
                }
        }
        else {
-               sdb_attribute_t *new = SDB_ATTR(sdb_object_clone(SDB_CONST_OBJ(attr)));
+               sdb_attribute_t *new = SDB_ATTR(sdb_object_create(key,
+                                       sdb_attribute_type, hostname, value));
                if (! new) {
                        char errbuf[1024];
                        sdb_log(SDB_LOG_ERR, "store: Failed to clone attribute "
@@ -401,20 +383,6 @@ sdb_store_attribute(const sdb_attribute_t *attr)
        return status;
 } /* sdb_store_attribute */
 
-sdb_service_t *
-sdb_service_create(const char *hostname, const char *name)
-{
-       sdb_object_t *obj;
-
-       if ((! hostname) || (! name))
-               return NULL;
-
-       obj = sdb_object_create(name, sdb_service_type, hostname);
-       if (! obj)
-               return NULL;
-       return SDB_SVC(obj);
-} /* sdb_service_create */
-
 int
 sdb_store_service(const sdb_service_t *svc)
 {
@@ -477,20 +445,6 @@ sdb_store_service(const sdb_service_t *svc)
        return status;
 } /* sdb_store_service */
 
-const sdb_service_t *
-sdb_store_get_service(const sdb_host_t *host, const char *name)
-{
-       sdb_service_t *svc;
-
-       if ((! host) || (! name))
-               return NULL;
-
-       svc = SDB_SVC(sdb_llist_search_by_name(host->services, name));
-       if (! svc)
-               return NULL;
-       return svc;
-} /* sdb_store_get_service */
-
 int
 sdb_store_dump(FILE *fh)
 {