Config: Dropping filter instruction trees after linearization

diff --git a/filter/decl.m4 b/filter/decl.m4
index b602686756898c9669f9ade3db25d0b3c9520aca..5b35b672ad52dc22d4be973b4bf51c1f37ed39b6 100644 (file)
--- a/filter/decl.m4
+++ b/filter/decl.m4
@@ -486,7 +486,7 @@ f_instruction_name_(enum f_instruction_code fi)
 static inline struct f_inst *
 fi_new(enum f_instruction_code fi_code)
 {
-  struct f_inst *what = cfg_allocz(sizeof(struct f_inst));
+  struct f_inst *what = tmp_allocz(sizeof(struct f_inst));
   what->lineno = ifs->lino;
   what->size = 1;
   what->fi_code = fi_code;

diff --git a/filter/f-inst.h b/filter/f-inst.h
index e35f71c6f25d381d31b986f35cb50ff3465ea513..72b080f808c2a97aa27e144c14c15d65f243d281 100644 (file)
--- a/filter/f-inst.h
+++ b/filter/f-inst.h
@@ -100,8 +100,6 @@ static inline struct f_dynamic_attr f_new_dynamic_attr_bit(u8 bit, enum f_type f
 { return (struct f_dynamic_attr) { .type = EAF_TYPE_BITFIELD, .bit = bit, .f_type = f_type, .ea_code = code }; }   /* f_type currently unused; will be handy for static type checking */
 static inline struct f_static_attr f_new_static_attr(int f_type, int code, int readonly)
 { return (struct f_static_attr) { .f_type = f_type, .sa_code = code, .readonly = readonly }; }
-struct f_inst *f_generate_complex(enum f_instruction_code fi_code, struct f_dynamic_attr da, struct f_inst *argument);
-struct f_inst *f_generate_roa_check(struct rtable_config *table, struct f_inst *prefix, struct f_inst *asn);
 
 /* Hook for call bt_assert() function in configuration */
 extern void (*bt_assert_hook)(int result, const struct f_line_item *assert);