From a5d0694571db763efd0787a680168492f325b2e6 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 4 Oct 2011 13:24:22 +0000
Subject: LRN: Use GNUNET_EXTRA_LOGGING to manage compile-time logging calls
 (#1805).

---
 src/util/bandwidth.c                          | 2 +-
 src/util/client.c                             | 2 +-
 src/util/connection.c                         | 2 +-
 src/util/disk.c                               | 4 ++--
 src/util/load.c                               | 2 +-
 src/util/network.c                            | 4 ++--
 src/util/resolver.h                           | 2 +-
 src/util/scheduler.c                          | 4 ++--
 src/util/server.c                             | 2 +-
 src/util/server_mst.c                         | 2 +-
 src/util/server_nc.c                          | 2 +-
 src/util/service.c                            | 2 +-
 src/util/test_client.c                        | 2 +-
 src/util/test_configuration.c                 | 2 +-
 src/util/test_connection.c                    | 2 +-
 src/util/test_connection_addressing.c         | 2 +-
 src/util/test_connection_receive_cancel.c     | 2 +-
 src/util/test_connection_timeout.c            | 2 +-
 src/util/test_connection_timeout_no_connect.c | 2 +-
 src/util/test_connection_transmit_cancel.c    | 2 +-
 src/util/test_os_start_process.c              | 2 +-
 src/util/test_peer.c                          | 2 +-
 src/util/test_plugin.c                        | 2 +-
 src/util/test_resolver_api.c                  | 2 +-
 src/util/test_scheduler.c                     | 2 +-
 src/util/test_scheduler_delay.c               | 2 +-
 src/util/test_server.c                        | 2 +-
 src/util/test_server_disconnect.c             | 2 +-
 src/util/test_server_with_client.c            | 2 +-
 src/util/test_server_with_client_unix.c       | 2 +-
 src/util/test_service.c                       | 2 +-
 src/util/test_strings.c                       | 2 +-
 src/util/test_time.c                          | 2 +-
 33 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'src/util')

diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c
index 8d81e55a0..c0ac54054 100644
--- a/src/util/bandwidth.c
+++ b/src/util/bandwidth.c
@@ -27,7 +27,7 @@
 #include "gnunet_bandwidth_lib.h"
 #include "gnunet_server_lib.h"
 
-#define DEBUG_BANDWIDTH GNUNET_NO
+#define DEBUG_BANDWIDTH GNUNET_EXTRA_LOGGING
 
 /**
  * Create a new bandwidth value.
diff --git a/src/util/client.c b/src/util/client.c
index e56856229..5193f751f 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -34,7 +34,7 @@
 #include "gnunet_server_lib.h"
 #include "gnunet_scheduler_lib.h"
 
-#define DEBUG_CLIENT GNUNET_NO
+#define DEBUG_CLIENT GNUNET_EXTRA_LOGGING
 
 /**
  * How often do we re-try tranmsitting requests before giving up?
diff --git a/src/util/connection.c b/src/util/connection.c
index bb5df7f57..6b2cf75e0 100644
--- a/src/util/connection.c
+++ b/src/util/connection.c
@@ -39,7 +39,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_server_lib.h"
 
-#define DEBUG_CONNECTION GNUNET_NO
+#define DEBUG_CONNECTION GNUNET_EXTRA_LOGGING
 
 /**
  * Possible functions to call after connect failed or succeeded.
diff --git a/src/util/disk.c b/src/util/disk.c
index 9059852d3..bb507bbff 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -34,9 +34,9 @@
 #include "gnunet_crypto_lib.h"
 #include "disk.h"
 
-#define DEBUG_NPIPE GNUNET_NO
+#define DEBUG_NPIPE GNUNET_EXTRA_LOGGING
 
-#define DEBUG_PIPE GNUNET_NO
+#define DEBUG_PIPE GNUNET_EXTRA_LOGGING
 
 /**
  * Block size for IO for copying files.
diff --git a/src/util/load.c b/src/util/load.c
index 35ed443c3..39e861597 100644
--- a/src/util/load.c
+++ b/src/util/load.c
@@ -26,7 +26,7 @@
 #include "platform.h"
 #include "gnunet_load_lib.h"
 
-#define DEBUG_LOAD GNUNET_NO
+#define DEBUG_LOAD GNUNET_EXTRA_LOGGING
 
 /**
  * Values we track for load calculations.
diff --git a/src/util/network.c b/src/util/network.c
index 27744bc1c..320304fe2 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -29,9 +29,9 @@
 #include "disk.h"
 #include "gnunet_container_lib.h"
 
-#define DEBUG_NETWORK GNUNET_NO
+#define DEBUG_NETWORK GNUNET_EXTRA_LOGGING
 
-#define DEBUG_W32_CYCLES GNUNET_NO
+#define DEBUG_W32_CYCLES GNUNET_EXTRA_LOGGING
 
 #ifndef INVALID_SOCKET
 #define INVALID_SOCKET -1
diff --git a/src/util/resolver.h b/src/util/resolver.h
index 5adf43633..57cb68650 100644
--- a/src/util/resolver.h
+++ b/src/util/resolver.h
@@ -27,7 +27,7 @@
 
 #include "gnunet_common.h"
 
-#define DEBUG_RESOLVER GNUNET_NO
+#define DEBUG_RESOLVER GNUNET_EXTRA_LOGGING
 
 /**
  * Request for the resolver.  Followed by either
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index e2f6700e4..dad924c32 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -48,7 +48,7 @@
 /**
  * Check each file descriptor before adding
  */
-#define DEBUG_FDS GNUNET_NO
+#define DEBUG_FDS GNUNET_EXTRA_LOGGING
 
 /**
  * Depth of the traces collected via EXECINFO.
@@ -56,7 +56,7 @@
 #define MAX_TRACE_DEPTH 50
 #endif
 
-#define DEBUG_TASKS GNUNET_NO
+#define DEBUG_TASKS GNUNET_EXTRA_LOGGING
 
 /**
  * Should we figure out which tasks are delayed for a while
diff --git a/src/util/server.c b/src/util/server.c
index c8eb15f1c..63993ee37 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -33,7 +33,7 @@
 #include "gnunet_disk_lib.h"
 #include "gnunet_protocols.h"
 
-#define DEBUG_SERVER GNUNET_NO
+#define DEBUG_SERVER GNUNET_EXTRA_LOGGING
 
 /**
  * List of arrays of message handlers.
diff --git a/src/util/server_mst.c b/src/util/server_mst.c
index ad3be8f63..adb0a0818 100644
--- a/src/util/server_mst.c
+++ b/src/util/server_mst.c
@@ -31,7 +31,7 @@
 #include "gnunet_server_lib.h"
 #include "gnunet_time_lib.h"
 
-#define DEBUG_SERVER_MST GNUNET_NO
+#define DEBUG_SERVER_MST GNUNET_EXTRA_LOGGING
 
 #if HAVE_UNALIGNED_64_ACCESS
 #define ALIGN_FACTOR 4
diff --git a/src/util/server_nc.c b/src/util/server_nc.c
index 7a26ab9bf..dc7a27c8b 100644
--- a/src/util/server_nc.c
+++ b/src/util/server_nc.c
@@ -34,7 +34,7 @@
 #include "gnunet_time_lib.h"
 
 
-#define DEBUG_SERVER_NC GNUNET_NO
+#define DEBUG_SERVER_NC GNUNET_EXTRA_LOGGING
 
 /**
  * Entry in list of messages pending to be transmitted.
diff --git a/src/util/service.c b/src/util/service.c
index ad74d2786..15937e117 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -36,7 +36,7 @@
 #include "gnunet_server_lib.h"
 #include "gnunet_service_lib.h"
 
-#define DEBUG_SERVICE GNUNET_NO
+#define DEBUG_SERVICE GNUNET_EXTRA_LOGGING
 
 /* ******************* access control ******************** */
 
diff --git a/src/util/test_client.c b/src/util/test_client.c
index f9d961ab6..bb7d5008a 100644
--- a/src/util/test_client.c
+++ b/src/util/test_client.c
@@ -29,7 +29,7 @@
 #include "gnunet_server_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define PORT 14325
 
diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c
index 2737cb4f7..f02705f86 100644
--- a/src/util/test_configuration.c
+++ b/src/util/test_configuration.c
@@ -28,7 +28,7 @@
 #include "gnunet_configuration_lib.h"
 #include "gnunet_disk_lib.h"
 
-#define DEBUG GNUNET_NO
+#define DEBUG GNUNET_EXTRA_LOGGING
 
 /* Test Configuration Diffs Options */
 enum
diff --git a/src/util/test_connection.c b/src/util/test_connection.c
index cb69f4036..92c0cea2e 100644
--- a/src/util/test_connection.c
+++ b/src/util/test_connection.c
@@ -27,7 +27,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define PORT 12435
 
diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c
index 2d08acc3c..018cf61fb 100644
--- a/src/util/test_connection_addressing.c
+++ b/src/util/test_connection_addressing.c
@@ -27,7 +27,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define PORT 12435
 
diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c
index aa1672455..63829344d 100644
--- a/src/util/test_connection_receive_cancel.c
+++ b/src/util/test_connection_receive_cancel.c
@@ -27,7 +27,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define PORT 12435
 
diff --git a/src/util/test_connection_timeout.c b/src/util/test_connection_timeout.c
index 2338665cb..1700718b9 100644
--- a/src/util/test_connection_timeout.c
+++ b/src/util/test_connection_timeout.c
@@ -27,7 +27,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define PORT 12435
 
diff --git a/src/util/test_connection_timeout_no_connect.c b/src/util/test_connection_timeout_no_connect.c
index 2e8f9be2e..b598907ec 100644
--- a/src/util/test_connection_timeout_no_connect.c
+++ b/src/util/test_connection_timeout_no_connect.c
@@ -27,7 +27,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define PORT 13425
 
diff --git a/src/util/test_connection_transmit_cancel.c b/src/util/test_connection_transmit_cancel.c
index d81c32a6c..50308a2d0 100644
--- a/src/util/test_connection_transmit_cancel.c
+++ b/src/util/test_connection_transmit_cancel.c
@@ -27,7 +27,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define PORT 12435
 
diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c
index 36dd42a23..df8520546 100644
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -33,7 +33,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "disk.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 static char *test_phrase = "HELLO WORLD";
 static int ok;
diff --git a/src/util/test_peer.c b/src/util/test_peer.c
index 1729114ff..3817d8243 100644
--- a/src/util/test_peer.c
+++ b/src/util/test_peer.c
@@ -29,7 +29,7 @@
 
 #define NUMBER_OF_PEERS 10
 
-#define DEBUG GNUNET_NO
+#define DEBUG GNUNET_EXTRA_LOGGING
 
 /**
  * A list of Peer ID's to play with
diff --git a/src/util/test_plugin.c b/src/util/test_plugin.c
index 9f1f0aad0..479edb3cb 100644
--- a/src/util/test_plugin.c
+++ b/src/util/test_plugin.c
@@ -24,7 +24,7 @@
 #include "platform.h"
 #include "gnunet_plugin_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 static int
 check ()
diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c
index 704dc479b..4e248aa72 100644
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -30,7 +30,7 @@
 #include "gnunet_resolver_service.h"
 #include "resolver.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 /**
  * Using DNS root servers to check gnunet's resolver service
diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c
index 3d8ae979c..788ba13fa 100644
--- a/src/util/test_scheduler.c
+++ b/src/util/test_scheduler.c
@@ -27,7 +27,7 @@
 #include "gnunet_time_lib.h"
 #include "gnunet_disk_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 static void
 task3 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
diff --git a/src/util/test_scheduler_delay.c b/src/util/test_scheduler_delay.c
index 8bcfa096e..ff6966a87 100644
--- a/src/util/test_scheduler_delay.c
+++ b/src/util/test_scheduler_delay.c
@@ -28,7 +28,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 static struct GNUNET_TIME_Absolute target;
 
diff --git a/src/util/test_server.c b/src/util/test_server.c
index 59bf8a2f4..6c79e6064 100644
--- a/src/util/test_server.c
+++ b/src/util/test_server.c
@@ -28,7 +28,7 @@
 #include "gnunet_server_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define PORT 12435
 
diff --git a/src/util/test_server_disconnect.c b/src/util/test_server_disconnect.c
index 8010695e8..69207f81a 100644
--- a/src/util/test_server_disconnect.c
+++ b/src/util/test_server_disconnect.c
@@ -28,7 +28,7 @@
 #include "gnunet_server_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define PORT 12435
 
diff --git a/src/util/test_server_with_client.c b/src/util/test_server_with_client.c
index 06a4b71d6..5b6e51718 100644
--- a/src/util/test_server_with_client.c
+++ b/src/util/test_server_with_client.c
@@ -30,7 +30,7 @@
 #include "gnunet_server_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define PORT 22335
 
diff --git a/src/util/test_server_with_client_unix.c b/src/util/test_server_with_client_unix.c
index 99af4e8c3..4f80f188c 100644
--- a/src/util/test_server_with_client_unix.c
+++ b/src/util/test_server_with_client_unix.c
@@ -30,7 +30,7 @@
 #include "gnunet_server_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define MY_TYPE 128
 
diff --git a/src/util/test_service.c b/src/util/test_service.c
index edfe33771..1b78932f8 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -31,7 +31,7 @@
 #include "gnunet_time_lib.h"
 
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define PORT 12435
 
diff --git a/src/util/test_strings.c b/src/util/test_strings.c
index 97b0f4105..c6d604144 100644
--- a/src/util/test_strings.c
+++ b/src/util/test_strings.c
@@ -25,7 +25,7 @@
 #include "gnunet_common.h"
 #include "gnunet_strings_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define WANT(a,b) if (0 != strcmp(a,b)) { fprintf(stderr, "Got `%s', wanted `%s'\n", b, a); GNUNET_free(b); GNUNET_break(0); return 1;} else { GNUNET_free (b); }
 #define WANTB(a,b,l) if (0 != memcmp(a,b,l)) { GNUNET_break(0); return 1;} else { }
diff --git a/src/util/test_time.c b/src/util/test_time.c
index 788884fcc..c5232ff2a 100644
--- a/src/util/test_time.c
+++ b/src/util/test_time.c
@@ -25,7 +25,7 @@
 #include "gnunet_common.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 static int
 check ()
-- 
cgit v1.2.3