store: Renamed store_base to store_obj.

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

diff --git a/src/core/store_lookup.c b/src/core/store_lookup.c
index 66f3f22dcfb9b5ec7a9fd447135ab493c7360f92..90ca2fed6060b36e15b8d4e04ea6fbdc341c0b07 100644 (file)
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
@@ -64,7 +64,7 @@ typedef struct {
  */
 
 static int
-lookup_iter(sdb_store_base_t *obj, void *user_data)
+lookup_iter(sdb_store_obj_t *obj, void *user_data)
 {
        lookup_iter_data_t *d = user_data;
 
@@ -73,11 +73,11 @@ lookup_iter(sdb_store_base_t *obj, void *user_data)
        return 0;
 } /* lookup_iter */
 
-static sdb_store_base_t *
+static sdb_store_obj_t *
 attr_get(sdb_host_t *host, const char *name)
 {
        sdb_llist_iter_t *iter = NULL;
-       sdb_store_base_t *attr = NULL;
+       sdb_store_obj_t *attr = NULL;
 
        iter = sdb_llist_get_iter(host->attributes);
        while (sdb_llist_iter_has_next(iter)) {
@@ -85,7 +85,7 @@ attr_get(sdb_host_t *host, const char *name)
 
                if (strcasecmp(name, SDB_OBJ(a)->name))
                        continue;
-               attr = STORE_BASE(a);
+               attr = STORE_OBJ(a);
                break;
        }
        sdb_llist_iter_destroy(iter);
@@ -97,7 +97,7 @@ attr_get(sdb_host_t *host, const char *name)
  */
 
 static int
-attr_cmp(sdb_store_base_t *obj, sdb_store_cond_t *cond)
+attr_cmp(sdb_store_obj_t *obj, sdb_store_cond_t *cond)
 {
        sdb_attribute_t *attr;
 
@@ -131,7 +131,7 @@ match_string(string_matcher_t *m, const char *name)
 } /* match_string */
 
 static int
-match_logical(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_logical(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
 {
        int status;
 
@@ -149,7 +149,7 @@ match_logical(sdb_store_matcher_t *m, sdb_store_base_t *obj)
 } /* match_logical */
 
 static int
-match_unary(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_unary(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
 {
        assert(m->type == MATCHER_NOT);
        assert(UOP_M(m)->op);
@@ -158,7 +158,7 @@ match_unary(sdb_store_matcher_t *m, sdb_store_base_t *obj)
 } /* match_unary */
 
 static int
-match_name(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_name(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
 {
        sdb_llist_iter_t *iter = NULL;
        int status = 0;
@@ -178,7 +178,7 @@ match_name(sdb_store_matcher_t *m, sdb_store_base_t *obj)
        }
 
        while (sdb_llist_iter_has_next(iter)) {
-               sdb_store_base_t *child = STORE_BASE(sdb_llist_iter_get_next(iter));
+               sdb_store_obj_t *child = STORE_OBJ(sdb_llist_iter_get_next(iter));
                if (match_string(&NAME_M(m)->name, child->super.name)) {
                        status = 1;
                        break;
@@ -189,7 +189,7 @@ match_name(sdb_store_matcher_t *m, sdb_store_base_t *obj)
 } /* match_name */
 
 static int
-match_attr(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_attr(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
 {
        sdb_attribute_t *attr;
 
@@ -208,7 +208,7 @@ match_attr(sdb_store_matcher_t *m, sdb_store_base_t *obj)
 } /* match_attr */
 
 static int
-match_lt(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_lt(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
 {
        int status;
        assert(m->type == MATCHER_LT);
@@ -217,7 +217,7 @@ match_lt(sdb_store_matcher_t *m, sdb_store_base_t *obj)
 } /* match_lt */
 
 static int
-match_le(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_le(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
 {
        int status;
        assert(m->type == MATCHER_LE);
@@ -226,7 +226,7 @@ match_le(sdb_store_matcher_t *m, sdb_store_base_t *obj)
 } /* match_le */
 
 static int
-match_eq(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_eq(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
 {
        int status;
        assert(m->type == MATCHER_EQ);
@@ -235,7 +235,7 @@ match_eq(sdb_store_matcher_t *m, sdb_store_base_t *obj)
 } /* match_eq */
 
 static int
-match_ge(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_ge(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
 {
        int status;
        assert(m->type == MATCHER_GE);
@@ -244,7 +244,7 @@ match_ge(sdb_store_matcher_t *m, sdb_store_base_t *obj)
 } /* match_ge */
 
 static int
-match_gt(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+match_gt(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
 {
        int status;
        assert(m->type == MATCHER_GT);
@@ -252,7 +252,7 @@ match_gt(sdb_store_matcher_t *m, sdb_store_base_t *obj)
        return (status != INT_MAX) && (status > 0);
 } /* match_gt */
 
-typedef int (*matcher_cb)(sdb_store_matcher_t *, sdb_store_base_t *);
+typedef int (*matcher_cb)(sdb_store_matcher_t *, sdb_store_obj_t *);
 
 /* this array needs to be indexable by the matcher types;
  * -> update the enum in store-private.h when updating this */
@@ -798,7 +798,7 @@ sdb_store_inv_matcher(sdb_store_matcher_t *m)
 } /* sdb_store_inv_matcher */
 
 int
-sdb_store_matcher_matches(sdb_store_matcher_t *m, sdb_store_base_t *obj)
+sdb_store_matcher_matches(sdb_store_matcher_t *m, sdb_store_obj_t *obj)
 {
        if (obj->type != SDB_HOST)
                return 0;