diff options
| author | Pavel Machek <pavel@ucw.cz> | 2000-04-26 09:31:45 +0200 |
|---|---|---|
| committer | Pavel Machek <pavel@ucw.cz> | 2000-04-26 09:31:45 +0200 |
| commit | 94d9dfa47a14609e7057f26614b4094dddc8439d (patch) | |
| tree | f5b43f453f3d915a5e4b46366c3d61ee88a7478d | |
| parent | 6fd766c17eedf4897e2dff712f0e06bb84dd3d8a (diff) | |
| download | bird-94d9dfa47a14609e7057f26614b4094dddc8439d.tar bird-94d9dfa47a14609e7057f26614b4094dddc8439d.zip | |
Startup renamed to __startup: it is internal function and mj already
uses word startup in other context.
| -rw-r--r-- | filter/config.Y | 2 | ||||
| -rw-r--r-- | filter/test.conf | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/filter/config.Y b/filter/config.Y index f33405f..2572501 100644 --- a/filter/config.Y +++ b/filter/config.Y @@ -208,7 +208,7 @@ function_def: FUNCTION SYM { DBG( "Begining of function %s\n", $2->name ); cf_push_scope($2); } function_params function_body { extern struct f_inst *startup_func; cf_define_symbol($2, SYM_FUNCTION, $5); - if (!strcasecmp($2->name, "startup")) + if (!strcasecmp($2->name, "__startup")) startup_func = $5; $2->aux = (int) $4; $2->aux2 = $5; diff --git a/filter/test.conf b/filter/test.conf index 9e6e31d..f1b3b66 100644 --- a/filter/test.conf +++ b/filter/test.conf @@ -46,6 +46,7 @@ clist l; p2 = prepend( p2, 5 ); print "Should be false: ", p2 ~ p; print "Should be true: ", p2 ~ / * 4 3 2 1 /, p2, / * 4 3 2 1 /; + print "Should be true: ", p2 ~ / * 4 3 * 1 /, p2, / * 4 3 * 1 /; print "5 = ", p2.len; l = - empty -; @@ -58,7 +59,13 @@ clist l; print "Should be false: ", (2,3) ~ l; } -function startup() +function bla() +{ + print "fifteen called"; + return 15; +} + +function __startup() int i; prefix px; ip p; |