store: Added a generic JSON formatter.

[sysdb.git] / src / core / store-private.h

diff --git a/src/core/store-private.h b/src/core/store-private.h
index 4c38f1570bca1d449a4478fa33119e410cf33136..953a8826c741abbb21e0b8b3e9871922da3e00d8 100644 (file)
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -106,6 +106,7 @@ typedef struct {
 /*
  * expressions
  */
+
 enum {
        ATTR_VALUE  = -2, /* attr name stored in data.data.string */
        FIELD_VALUE = -1, /* field type stored in data.data.integer */
@@ -136,6 +137,7 @@ enum {
        MATCHER_AND,
        MATCHER_NOT,
        MATCHER_ANY,
+       MATCHER_ALL,
        MATCHER_LT,
        MATCHER_LE,
        MATCHER_EQ,
@@ -153,8 +155,8 @@ enum {
        (((t) == MATCHER_OR) ? "OR" \
                : ((t) == MATCHER_AND) ? "AND" \
                : ((t) == MATCHER_NOT) ? "NOT" \
-               : ((t) == MATCHER_NAME) ? "NAME" \
                : ((t) == MATCHER_ANY) ? "ANY" \
+               : ((t) == MATCHER_ALL) ? "ALL" \
                : ((t) == MATCHER_LT) ? "<" \
                : ((t) == MATCHER_LE) ? "<=" \
                : ((t) == MATCHER_EQ) ? "=" \
@@ -168,12 +170,6 @@ enum {
                : ((t) == MATCHER_ISNNULL) ? "IS NOT NULL" \
                : "UNKNOWN")
 
-/* match the name of something */
-typedef struct {
-       char    *name;
-       regex_t *name_re;
-} string_matcher_t;
-
 /* matcher base type */
 struct sdb_store_matcher {
        sdb_object_t super;
@@ -219,15 +215,6 @@ typedef struct {
 } cmp_matcher_t;
 #define CMP_M(m) ((cmp_matcher_t *)(m))
 
-/* match any type of object by it's name */
-typedef struct {
-       sdb_store_matcher_t super;
-
-       int obj_type;
-       string_matcher_t name;
-} name_matcher_t;
-#define NAME_M(m) ((name_matcher_t *)(m))
-
 typedef struct {
        sdb_store_matcher_t super;
        sdb_store_expr_t *expr;