summaryrefslogtreecommitdiff
path: root/filter/f-util.c
diff options
context:
space:
mode:
authorMaria Matejka <mq@ucw.cz>2019-07-03 08:44:42 +0200
committerMaria Matejka <mq@ucw.cz>2019-07-03 08:44:42 +0200
commit8816b6cdd98d24535eece6b5e35730aac57cd9f7 (patch)
tree190aedf5b4d8c8c9df7ba91d16423aadc5fbe716 /filter/f-util.c
parentc376555cecbfea83314e9f76bce5002185d3566a (diff)
parent84ac62d3967f5294f4dc208b803a273a101744a8 (diff)
Merge branch 'mq-filter-stack' of gitlab.labs.nic.cz:labs/bird into mq-filter-stack
Diffstat (limited to 'filter/f-util.c')
-rw-r--r--filter/f-util.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/filter/f-util.c b/filter/f-util.c
index 4b580fb9..e61949f2 100644
--- a/filter/f-util.c
+++ b/filter/f-util.c
@@ -33,17 +33,17 @@ filter_name(const struct filter *filter)
struct filter *f_new_where(struct f_inst *where)
{
struct f_inst acc = {
- .fi_code = FI_PRINT_AND_DIE,
+ .fi_code = FI_DIE,
.lineno = ifs->lino,
.size = 1,
- .i_FI_PRINT_AND_DIE = { .fret = F_ACCEPT, },
+ .i_FI_DIE = { .fret = F_ACCEPT, },
};
struct f_inst rej = {
- .fi_code = FI_PRINT_AND_DIE,
+ .fi_code = FI_DIE,
.lineno = ifs->lino,
.size = 1,
- .i_FI_PRINT_AND_DIE = { .fret = F_REJECT, },
+ .i_FI_DIE = { .fret = F_REJECT, },
};
struct f_inst i = {
@@ -174,7 +174,7 @@ ca_lookup(pool *p, const char *name, int f_type)
}
cas = mb_allocz(&root_pool, sizeof(struct ca_storage) + strlen(name) + 1);
- cas->fda = f_new_dynamic_attr(ea_type, 0, f_type, EA_CUSTOM(id));
+ cas->fda = f_new_dynamic_attr(ea_type, f_type, EA_CUSTOM(id));
cas->uc = 1;
strcpy(cas->name, name);