Great cleanup of debug messages. LOCAL_DEBUG turned off in most modules,

several debug() calls converted to DBG().

11 files changed, 30 insertions, 26 deletions

diff --git a/conf/conf.c b/conf/conf.c
index bf586315..21413e50 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -9,7 +9,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 
-#define LOCAL_DEBUG
+#undef LOCAL_DEBUG
 
 #include "nest/bird.h"
 #include "nest/route.h"
diff --git a/filter/filter.c b/filter/filter.c
index 8fd0f78d..3bb21e68 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -9,6 +9,8 @@
  *
  */
 
+#undef LOCAL_DEBUG
+
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -525,7 +527,7 @@ f_run(struct filter *filter, struct rte **rte, struct ea_list **tmp_attrs, struc
 {
   struct f_inst *inst;
   struct f_val res;
-  debug( "Running filter `%s'...", filter->name );
+  DBG( "Running filter `%s'...", filter->name );
 
   f_tmp_attrs = tmp_attrs;
   f_rte = rte;
@@ -535,7 +537,7 @@ f_run(struct filter *filter, struct rte **rte, struct ea_list **tmp_attrs, struc
   res = interpret(inst);
   if (res.type != T_RETURN)
     return F_ERROR;
-  debug( "done (%d)\n", res.val.i );
+  DBG( "done (%d)\n", res.val.i );
   return res.val.i;
 }
 
diff --git a/nest/iface.c b/nest/iface.c
index cf91833b..0ba6bef9 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -426,7 +426,7 @@ auto_router_id(void)
       j = i;
   if (!j)
     die("Cannot determine router ID (no suitable network interface found), please configure it manually");
-  log(L_INFO, "Guessed router ID %I according to interface %s", j->addr->ip, j->name);
+  log(L_INFO "Guessed router ID %I according to interface %s", j->addr->ip, j->name);
   config->router_id = ipa_to_u32(j->addr->ip);
 #endif
 }
diff --git a/nest/neighbor.c b/nest/neighbor.c
index e9be8658..c4328b6c 100644
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@ -6,7 +6,7 @@
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#define LOCAL_DEBUG
+#undef LOCAL_DEBUG
 
 #include "nest/bird.h"
 #include "nest/iface.h"
diff --git a/nest/proto.c b/nest/proto.c
index f137aa50..7243fcd5 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -6,7 +6,7 @@
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#define LOCAL_DEBUG
+#undef LOCAL_DEBUG
 
 #include <string.h>
 
@@ -157,15 +157,15 @@ protos_preconfig(struct config *c)
   struct protocol *p;
 
   init_list(&c->protos);
-  debug("Protocol preconfig:");
+  DBG("Protocol preconfig:");
   WALK_LIST(p, protocol_list)
     {
-      debug(" %s", p->name);
+      DBG(" %s", p->name);
       p->name_counter = 0;
       if (p->preconfig)
 	p->preconfig(p, c);
     }
-  debug("\n");
+  DBG("\n");
 }
 
 void
@@ -174,15 +174,15 @@ protos_postconfig(struct config *c)
   struct proto_config *x;
   struct protocol *p;
 
-  debug("Protocol postconfig:");
+  DBG("Protocol postconfig:");
   WALK_LIST(x, c->protos)
     {
-      debug(" %s", x->name);
+      DBG(" %s", x->name);
       p = x->protocol;
       if (p->postconfig)
 	p->postconfig(x);
     }
-  debug("\n");
+  DBG("\n");
 }
 
 static struct proto *
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index edadeba5..d42ed157 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -6,7 +6,7 @@
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#define LOCAL_DEBUG
+#undef LOCAL_DEBUG
 
 #include <string.h>
 
@@ -35,7 +35,7 @@ dev_ifa_notify(struct proto *p, unsigned c, struct ifa *ad)
       n = net_find(p->table, ad->prefix, ad->pxlen);
       if (!n)
 	{
-	  debug("dev_if_notify: device shutdown: prefix not found\n");
+	  DBG("dev_if_notify: device shutdown: prefix not found\n");
 	  return;
 	}
       rte_update(p->table, n, p, NULL);
@@ -46,7 +46,7 @@ dev_ifa_notify(struct proto *p, unsigned c, struct ifa *ad)
       net *n;
       rte *e;
 
-      debug("dev_if_notify: %s:%I going up\n", ad->iface->name, ad->ip);
+      DBG("dev_if_notify: %s:%I going up\n", ad->iface->name, ad->ip);
       bzero(&A, sizeof(A));
       A.proto = p;
       A.source = RTS_DEVICE;
diff --git a/nest/rt-fib.c b/nest/rt-fib.c
index efc2cd8e..4d898763 100644
--- a/nest/rt-fib.c
+++ b/nest/rt-fib.c
@@ -6,7 +6,7 @@
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#define LOCAL_DEBUG
+#undef LOCAL_DEBUG
 
 #include <string.h>
 
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 7d992aa7..f255a05e 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -8,7 +8,7 @@
 
 #include <string.h>
 
-#define LOCAL_DEBUG
+#undef LOCAL_DEBUG
 
 #include "nest/bird.h"
 #include "nest/route.h"
@@ -196,7 +196,7 @@ rt_feed_baby(struct proto *p)
 
   if (!p->ahooks)
     return;
-  debug("Announcing routes to new protocol %s\n", p->name);
+  DBG("Announcing routes to new protocol %s\n", p->name);
   for(h=p->ahooks; h; h=h->next)
     {
       rtable *t = h->table;
diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index f1a190f9..dde2ee7c 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -6,7 +6,7 @@
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#define LOCAL_DEBUG
+#undef LOCAL_DEBUG
 
 #include "nest/bird.h"
 #include "nest/iface.h"
diff --git a/proto/static/static.c b/proto/static/static.c
index afd3a10c..1aee2c7b 100644
--- a/proto/static/static.c
+++ b/proto/static/static.c
@@ -6,7 +6,7 @@
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#define LOCAL_DEBUG
+#undef LOCAL_DEBUG
 
 #include <string.h>
 
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 5019a3d5..58fffda4 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -6,6 +6,8 @@
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
+#define LOCAL_DEBUG
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -275,7 +277,7 @@ cli_init_unix(void)
 void
 async_shutdown(void)
 {
-  debug("Shutting down...\n");
+  DBG("Shutting down...\n");
   order_shutdown();
 }
 
@@ -293,21 +295,21 @@ sysdep_shutdown_done(void)
 static void
 handle_sighup(int sig)
 {
-  debug("Caught SIGHUP...\n");
+  DBG("Caught SIGHUP...\n");
   async_config_flag = 1;
 }
 
 static void
 handle_sigusr(int sig)
 {
-  debug("Caught SIGUSR...\n");
+  DBG("Caught SIGUSR...\n");
   async_dump_flag = 1;
 }
 
 static void
 handle_sigterm(int sig)
 {
-  debug("Caught SIGTERM...\n");
+  DBG("Caught SIGTERM...\n");
   async_shutdown_flag = 1;
 }
 
@@ -392,7 +394,7 @@ main(int argc, char **argv)
 
   log(L_INFO "Launching BIRD " BIRD_VERSION "...");
 
-  debug("Initializing.\n");
+  DBG("Initializing.\n");
   resource_init();
   olock_init();
   io_init();
@@ -412,7 +414,7 @@ main(int argc, char **argv)
   ev_run_list(&global_event_list);
   async_dump();
 
-  debug("Entering I/O loop.\n");
+  DBG("Entering I/O loop.\n");
 
   io_loop();
   bug("I/O loop died");