} filter_hook_t;
ARRAY(filter_hook_t)
-typedef struct filter_params_t {
+typedef struct filter_param_t {
filter_param_id_t type;
- char *value;
-} filter_params_t;
-ARRAY(filter_params_t)
+ char *value;
+ int value_len;
+} filter_param_t;
+ARRAY(filter_param_t)
typedef struct filter_t {
char *name;
A(filter_hook_t) hooks;
void *data;
- A(filter_params_t) params;
+ A(filter_param_t) params;
+
+ /* Loop checking flags.
+ */
+ int last_seen;
} filter_t;
ARRAY(filter_t)
-#define FILTER_INIT { NULL, FTK_UNKNOWN, ARRAY_INIT, NULL, ARRAY_INIT }
+#define FILTER_INIT { NULL, FTK_UNKNOWN, ARRAY_INIT, NULL, ARRAY_INIT, -1 }
#define CHECK_FILTER(Filter) \
assert(Filter != FTK_UNKNOWN && Filter != FTK_count \
&& "Unknown filter type")
}
__attribute__((nonnull(1,2)))
-void filter_set_name(filter_t *filter, const char *name, ssize_t len);
+void filter_set_name(filter_t *filter, const char *name, int len);
__attribute__((nonnull(1,2)))
-bool filter_set_type(filter_t *filter, const char *type, ssize_t len);
+bool filter_set_type(filter_t *filter, const char *type, int len);
__attribute__((nonnull(1,2,4)))
-bool filter_add_param(filter_t *filter, const char *name, ssize_t name_len,
- const char *value, ssize_t value_len);
+bool filter_add_param(filter_t *filter, const char *name, int name_len,
+ const char *value, int value_len);
__attribute__((nonnull(1,2,4)))
-bool filter_add_hook(filter_t *filter, const char *name, ssize_t name_len,
- const char *value, ssize_t value_len);
+bool filter_add_hook(filter_t *filter, const char *name, int name_len,
+ const char *value, int value_len);
__attribute__((nonnull(1)))
bool filter_build(filter_t *filter);
__attribute__((nonnull(1,2)))
-static inline int filter_find_with_name(A(filter_t) *array, const char *name)
+static inline int filter_find_with_name(const A(filter_t) *array, const char *name)
{
int start = 0;
int end = array->len;
__attribute__((nonnull(1,2)))
bool filter_update_references(filter_t *filter, A(filter_t) *array);
+__attribute__((nonnull(1)))
+bool filter_check_safety(A(filter_t) *array);
+
__attribute__((nonnull(1)))
static inline void filter_hook_wipe(filter_hook_t *hook)
{
}
__attribute__((nonnull(1)))
-static inline void filter_params_wipe(filter_params_t *param)
+static inline void filter_params_wipe(filter_param_t *param)
{
p_delete(¶m->value);
}
void filter_wipe(filter_t *filter);
__attribute__((nonnull(1,2)))
-filter_result_t filter_run(const filter_t *filter, const query_t *query);
+const filter_hook_t *filter_run(const filter_t *filter, const query_t *query);
+
+__attribute__((nonnull(1,2)))
+bool filter_test(const filter_t *filter, const query_t *query, filter_result_t expt);
+
+
+/* Helpers
+ */
+#define FILTER_PARAM_PARSE_STRING(Param, Dest) \
+ case ATK_ ## Param: { \
+ (Dest) = param->value; \
+ } break
+
+#define FILTER_PARAM_PARSE_INT(Param, Dest) \
+ case ATK_ ## Param: { \
+ char *next; \
+ (Dest) = strtol(param->value, &next, 10); \
+ PARSE_CHECK(!*next, "invalid %s value %.*s", atokens[ATK_ ## Param], \
+ param->value_len, param->value); \
+ } break
+
+#define FILTER_PARAM_PARSE_BOOLEAN(Param, Dest) \
+ case ATK_ ## Param: { \
+ if (param->value_len == 1 && param->value[0] == '1') { \
+ (Dest) = true; \
+ } else if (param->value_len == 1 && param->value[0] == '0') { \
+ (Dest) = false; \
+ } else if (param->value_len == 4 \
+ && ascii_tolower(param->value[0]) == 't') { \
+ (Dest) = ascii_tolower(param->value[1]) == 'r' \
+ && ascii_tolower(param->value[2]) == 'u' \
+ && ascii_tolower(param->value[3]) == 'e'; \
+ } else if (param->value_len == 5 \
+ && ascii_tolower(param->value[0]) == 'f') { \
+ (Dest) = ascii_tolower(param->value[1]) == 'a' \
+ && ascii_tolower(param->value[2]) == 'l' \
+ && ascii_tolower(param->value[3]) == 's' \
+ && ascii_tolower(param->value[4]) == 'e'; \
+ } else { \
+ PARSE_CHECK(false, "invalid %s value %.*s", atokens[ATK_ ## Param],\
+ param->value_len, param->value); \
+ } \
+ } break
#endif