index 05a963876638854f0bd290c9b454b0815c8b6c37..0db46f84b5d6c28393d8a7d49b8e8dd453471335 100644 (file)
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
MATCHER_NOT,
MATCHER_NAME,
MATCHER_ATTR,
- MATCHER_HOST,
};
/* match the name of something */
typedef struct {
char *name;
regex_t *name_re;
-} name_matcher_t;
+} string_matcher_t;
/* matcher base type */
struct sdb_store_matcher {
};
#define M(m) ((sdb_store_matcher_t *)(m))
-/* logical infix operator matcher */
+/* infix operator matcher */
typedef struct {
sdb_store_matcher_t super;
} op_matcher_t;
#define OP_M(m) ((op_matcher_t *)(m))
-/* logical unary operator matcher */
+/* unary operator matcher */
typedef struct {
sdb_store_matcher_t super;
sdb_store_matcher_t super;
int obj_type;
-
- /* match by the name of the object */
- name_matcher_t name;
-} obj_matcher_t;
-#define OBJ_M(m) ((obj_matcher_t *)(m))
+ string_matcher_t name;
+} name_matcher_t;
+#define NAME_M(m) ((name_matcher_t *)(m))
/* match attributes */
typedef struct {
char *name;
/* XXX: this needs to be more flexible;
* add support for type-specific operators */
- name_matcher_t value;
+ string_matcher_t value;
} attr_matcher_t;
#define ATTR_M(m) ((attr_matcher_t *)(m))
-/* match hosts */
-typedef struct {
- obj_matcher_t super;
- /* match by attributes assigned to the host */
- attr_matcher_t *attr;
-} host_matcher_t;
-#define HOST_M(m) ((host_matcher_t *)(m))
-
#ifdef __cplusplus
} /* extern "C" */
#endif