some bugfixes

[svn/Prometheus-QoS/.git] / prometheus.c

diff --git a/prometheus.c b/prometheus.c
index e091d6e095df8ada02c802803c5d84cdf1a67a2d..43238b3ca276161ffa5d04a00e9f125b8df23bbd 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -581,6 +581,23 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
  string(str, STRLEN); \r
  string(limit_pkts, STRLEN);\r
 \r
+ /*-----------------------------------------------------------------*/\r
+ printf("Parsing macro definition file %s ...\n", macrosfile);\r
+ /*-----------------------------------------------------------------*/\r
+ parse(macrosfile)\r
+ {\r
+  ptr = parse_datafile_line(_);\r
+  if(ptr)\r
+  {\r
+   create(macro, Macro);\r
+   macro->rewrite_from = _;\r
+   macro->rewrite_to = ptr;\r
+   push(macro, macros);\r
+   printf("%s -> %s\n", macro->rewrite_from, macro->rewrite_to);\r
+  }\r
+ }\r
+ done; /* ugly macro end */\r
+\r
  /*-----------------------------------------------------------------*/\r
  printf("Parsing class defintion file %s ...\n", hosts);\r
  /*-----------------------------------------------------------------*/\r
@@ -631,25 +648,6 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
   done; /* ugly macro end */\r
  }\r
 \r
- if(enable_credit && just_flush<9)\r
- {\r
-  /*-----------------------------------------------------------------*/\r
-  printf("Parsing macro definition file %s ...\n", macrosfile);\r
-  /*-----------------------------------------------------------------*/\r
-  parse(macrosfile)\r
-  {\r
-   ptr = parse_datafile_line(_);\r
-   if(ptr)\r
-   {\r
-    create(macro, Macro);\r
-    macro->rewrite_from = _;\r
-    macro->rewrite_to = ptr;\r
-    push(macro, macros);\r
-    printf("%s -> %s\n", macro->rewrite_from, macro->rewrite_to);\r
-   }\r
-  }\r
-  done; /* ugly macro end */\r
- }\r
 \r
  if(!just_preview)\r
  {\r