data: Added explicit NULL values.

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

diff --git a/src/core/store.c b/src/core/store.c
index f4f2b58f0d700c0df8967aafddd6429261732af8..81aedfb7600a9243accbe4e49cceffcf87f8c54b 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -896,7 +896,7 @@ sdb_store_get_field(sdb_store_obj_t *obj, int field, sdb_data_t *res)
 {
        sdb_data_t tmp;
 
-       if ((! obj) || (! res))
+       if (! obj)
                return -1;
 
        switch (field) {
@@ -905,19 +905,18 @@ sdb_store_get_field(sdb_store_obj_t *obj, int field, sdb_data_t *res)
                        tmp.data.string = strdup(SDB_OBJ(obj)->name);
                        if (! tmp.data.string)
                                return -1;
-                       *res = tmp;
                        break;
                case SDB_FIELD_LAST_UPDATE:
-                       res->type = SDB_TYPE_DATETIME;
-                       res->data.datetime = obj->last_update;
+                       tmp.type = SDB_TYPE_DATETIME;
+                       tmp.data.datetime = obj->last_update;
                        break;
                case SDB_FIELD_AGE:
-                       res->type = SDB_TYPE_DATETIME;
-                       res->data.datetime = sdb_gettime() - obj->last_update;
+                       tmp.type = SDB_TYPE_DATETIME;
+                       tmp.data.datetime = sdb_gettime() - obj->last_update;
                        break;
                case SDB_FIELD_INTERVAL:
-                       res->type = SDB_TYPE_DATETIME;
-                       res->data.datetime = obj->interval;
+                       tmp.type = SDB_TYPE_DATETIME;
+                       tmp.data.datetime = obj->interval;
                        break;
                case SDB_FIELD_BACKEND:
                        /* TODO: add support for storing array values in a data object
@@ -925,9 +924,56 @@ sdb_store_get_field(sdb_store_obj_t *obj, int field, sdb_data_t *res)
                default:
                        return -1;
        }
+       if (res)
+               *res = tmp;
+       else
+               sdb_data_free_datum(&tmp);
        return 0;
 } /* sdb_store_get_field */
 
+int
+sdb_store_get_attr(sdb_store_obj_t *obj, const char *name, sdb_data_t *res,
+               sdb_store_matcher_t *filter)
+{
+       sdb_avltree_t *tree = NULL;
+       sdb_avltree_iter_t *iter = NULL;
+
+       if ((! obj) || (! name))
+               return -1;
+
+       if (obj->type == SDB_HOST)
+               tree = HOST(obj)->attributes;
+       else if (obj->type == SDB_SERVICE)
+               tree = SVC(obj)->attributes;
+       else if (obj->type == SDB_METRIC)
+               tree = METRIC(obj)->attributes;
+
+       if (! tree)
+               return -1;
+
+       iter = sdb_avltree_get_iter(tree);
+       while (sdb_avltree_iter_has_next(iter)) {
+               sdb_object_t *attr = sdb_avltree_iter_get_next(iter);
+
+               if (strcasecmp(SDB_OBJ(attr)->name, name))
+                       continue;
+
+               if (filter&& (! sdb_store_matcher_matches(filter,
+                                               STORE_OBJ(attr), NULL)))
+                       break; /* found it but it's filtered */
+
+               assert(STORE_OBJ(attr)->type == SDB_ATTRIBUTE);
+               if (res)
+                       sdb_data_copy(res, &ATTR(attr)->value);
+               sdb_avltree_iter_destroy(iter);
+               return 0;
+       }
+       sdb_avltree_iter_destroy(iter);
+
+       /* not found */
+       return -1;
+} /* sdb_store_get_attr */
+
 int
 sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf,
                sdb_store_matcher_t *filter, int flags)