X-Git-Url: https://git.harvie.cz/?p=svn%2FPrometheus-QoS%2F.git;a=blobdiff_plain;f=prometheus.c;h=43238b3ca276161ffa5d04a00e9f125b8df23bbd;hp=e091d6e095df8ada02c802803c5d84cdf1a67a2d;hb=8dcd2b4cab6d481b0875c702176505b6ef6b6d5d;hpb=bb5e73853e892f8bce70e03344a81b192c2b84ff

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