projects
/
apps
/
pfixtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add likely/unlikely macros.
[apps/pfixtools.git]
/
postlicyd
/
filter.h
diff --git
a/postlicyd/filter.h
b/postlicyd/filter.h
index
f53b917
..
3047803
100644
(file)
--- a/
postlicyd/filter.h
+++ b/
postlicyd/filter.h
@@
-58,8
+58,8
@@
ARRAY(filter_hook_t)
typedef struct filter_param_t {
filter_param_id_t type;
typedef struct filter_param_t {
filter_param_id_t type;
- char
*value;
-
ssize_t
value_len;
+ char *value;
+
int
value_len;
} filter_param_t;
ARRAY(filter_param_t)
} filter_param_t;
ARRAY(filter_param_t)
@@
-72,14
+72,13
@@
typedef struct filter_t {
A(filter_param_t) params;
A(filter_param_t) params;
- /*
Internal: to check the filter tree structure
.
+ /*
Loop checking flags
.
*/
*/
- unsigned safe :1;
- unsigned seen :1;
+ int last_seen;
} filter_t;
ARRAY(filter_t)
} filter_t;
ARRAY(filter_t)
-#define FILTER_INIT { NULL, FTK_UNKNOWN, ARRAY_INIT, NULL, ARRAY_INIT,
false, false
}
+#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")
#define CHECK_FILTER(Filter) \
assert(Filter != FTK_UNKNOWN && Filter != FTK_count \
&& "Unknown filter type")
@@
-113,24
+112,24
@@
static inline void filter_init(filter_t *filter)
}
__attribute__((nonnull(1,2)))
}
__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,
in
t len);
__attribute__((nonnull(1,2)))
__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,
in
t len);
__attribute__((nonnull(1,2,4)))
__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,
in
t name_len,
+ const char *value,
in
t value_len);
__attribute__((nonnull(1,2,4)))
__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,
in
t name_len,
+ const char *value,
in
t value_len);
__attribute__((nonnull(1)))
bool filter_build(filter_t *filter);
__attribute__((nonnull(1,2)))
__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;
{
int start = 0;
int end = array->len;
@@
-174,6
+173,9
@@
void filter_wipe(filter_t *filter);
__attribute__((nonnull(1,2)))
const filter_hook_t *filter_run(const filter_t *filter, const query_t *query);
__attribute__((nonnull(1,2)))
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
*/
/* Helpers
*/