Startup renamed to __startup: it is internal function and mj already

uses word startup in other context.

diff --git a/filter/config.Y b/filter/config.Y
index f33405f972e1d8d8a4a7d670ffdcf77d226fda84..2572501f5416db037855e210175ff70c304e1bf1 100644 (file)
--- 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 9e6e31d024dc5d459e1bd10f914e7ac51ae97069..f1b3b66ecc96e83742af8857ee7a8aa255dbcf63 100644 (file)
--- 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;