summaryrefslogtreecommitdiffstats
path: root/filter
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>2000-05-15 12:53:56 +0200
committerMartin Mares <mj@ucw.cz>2000-05-15 12:53:56 +0200
commit3b1c523d79763b22e0fe06862ff349fd94e816b1 (patch)
treeed28d1bc45fb08916ba0478acd3daac4a0c42cc0 /filter
parent1c20608e02109ef0839e0168d100c75f0cc65fd9 (diff)
downloadbird-3b1c523d79763b22e0fe06862ff349fd94e816b1.tar
bird-3b1c523d79763b22e0fe06862ff349fd94e816b1.zip
Got rid of startup functions and filters_postconfig().
By the way, how do you expect pointers to fit in an int?
Diffstat (limited to 'filter')
-rw-r--r--filter/config.Y7
-rw-r--r--filter/filter.c21
-rw-r--r--filter/filter.h1
3 files changed, 0 insertions, 29 deletions
diff --git a/filter/config.Y b/filter/config.Y
index 4c4a859..8988241 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -170,14 +170,7 @@ function_body:
CF_ADDTO(conf, function_def)
function_def:
FUNCTION SYM { DBG( "Beginning of function %s\n", $2->name ); cf_push_scope($2); } function_params function_body {
- extern struct f_inst *startup_func, *test1_func, *test2_func;
cf_define_symbol($2, SYM_FUNCTION, $5);
- if (!strcasecmp($2->name, "__startup"))
- startup_func = $5;
- if (!strcasecmp($2->name, "__test1"))
- test1_func = $5;
- if (!strcasecmp($2->name, "__test2"))
- test2_func = $5;
$2->aux = (int) $4;
$2->aux2 = $5;
DBG("Hmm, we've got one function here - %s\n", $2->name);
diff --git a/filter/filter.c b/filter/filter.c
index 2510b6a..c9350c9 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -43,8 +43,6 @@
#define P(a,b) ((a<<8) | b)
-struct f_inst *startup_func = NULL, *test1_func, *test2_func;
-
#define CMP_ERROR 999
static int
@@ -682,25 +680,6 @@ f_eval_int(struct f_inst *expr)
return res.val.i;
}
-void
-filters_postconfig(void)
-{
- struct f_val res;
-
-#if 1
- if (!i_same(test1_func, test2_func))
- bug("i_same does not work");
-#endif
- if (startup_func) {
- debug( "Launching startup function...\n" );
- f_pool = lp_new(&root_pool, 1024);
- res = interpret(startup_func);
- if (res.type == F_ERROR)
- die( "Startup function resulted in error." );
- debug( "done\n" );
- }
-}
-
/**
* filter_same - compare two filters
* @new: first filter to be compared
diff --git a/filter/filter.h b/filter/filter.h
index b746063..3a62cd7 100644
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -58,7 +58,6 @@ struct filter {
struct f_inst *root;
};
-void filters_postconfig(void);
struct f_inst *f_new_inst(void);
struct f_inst *f_new_dynamic_attr(int type, int f_type, int code); /* Type as core knows it, type as filters know it, and code of dynamic attribute */
struct f_tree *f_new_tree(void);