From c12692b966d6e98b564940d72469a8dd1348a77d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 6 May 2012 12:59:09 +0000 Subject: [PATCH] -eliminating legacy defines --- src/ats/ats_api_scheduling.c | 19 ------------------- src/ats/perf_ats_mlp.c | 7 ++----- src/ats/test_ats_api_bandwidth_consumption.c | 11 ----------- src/ats/test_ats_api_scheduling.c | 11 ----------- src/ats/test_ats_api_update_address.c | 8 -------- src/ats/test_ats_mlp.c | 7 ------- src/ats/test_ats_mlp_averaging.c | 7 ------- 7 files changed, 2 insertions(+), 68 deletions(-) diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c index eef0fa922..3c98b238c 100644 --- a/src/ats/ats_api_scheduling.c +++ b/src/ats/ats_api_scheduling.c @@ -847,25 +847,6 @@ GNUNET_ATS_address_get_type (struct GNUNET_ATS_SchedulingHandle * sh, const stru /* no local network found for this address, default: WAN */ if (type == GNUNET_ATS_NET_UNSPECIFIED) type = GNUNET_ATS_NET_WAN; - -#if VERBOSE - const char * range; - switch (type) { - case GNUNET_ATS_NET_WAN: - range = "WAN"; - break; - case GNUNET_ATS_NET_LAN: - range = "LAN"; - break; - case GNUNET_ATS_NET_LOOPBACK: - range = "LOOPBACK"; - break; - default: - - break; - } -#endif - ats.type = htonl (GNUNET_ATS_NETWORK_TYPE); ats.value = htonl (type); return (const struct GNUNET_ATS_Information) ats; diff --git a/src/ats/perf_ats_mlp.c b/src/ats/perf_ats_mlp.c index 0692f1594..a06f16c3e 100644 --- a/src/ats/perf_ats_mlp.c +++ b/src/ats/perf_ats_mlp.c @@ -29,9 +29,6 @@ #include "gnunet_statistics_service.h" #include "gnunet-service-ats_addresses_mlp.h" -#define VERBOSE GNUNET_YES -#define VERBOSE_ARM GNUNET_NO - #define MLP_MAX_EXEC_DURATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3) #define MLP_MAX_ITERATIONS INT_MAX @@ -54,9 +51,9 @@ struct ATS_Address *a; static int ret; -struct GNUNET_CONTAINER_MultiHashMap * amap; +static struct GNUNET_CONTAINER_MultiHashMap * amap; -struct GAS_MLP_Handle *mlp; +static struct GAS_MLP_Handle *mlp; diff --git a/src/ats/test_ats_api_bandwidth_consumption.c b/src/ats/test_ats_api_bandwidth_consumption.c index a84927d58..c28364713 100644 --- a/src/ats/test_ats_api_bandwidth_consumption.c +++ b/src/ats/test_ats_api_bandwidth_consumption.c @@ -28,10 +28,6 @@ #include "gnunet_ats_service.h" #include "ats.h" -#define VERBOSE GNUNET_NO - -#define VERBOSE_ARM GNUNET_NO - #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) static GNUNET_SCHEDULER_TaskIdentifier die_task; @@ -201,9 +197,6 @@ start_arm (const char *cfgname) arm_proc = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", -#if VERBOSE_ARM - "-L", "DEBUG", -#endif "-c", cfgname, NULL); } @@ -263,11 +256,7 @@ main (int argc, char *argv[]) static char *const argv2[] = { "test_ats_api_bandwidth_consumption", "-c", "test_ats_api.conf", -#if VERBOSE - "-L", "DEBUG", -#else "-L", "WARNING", -#endif NULL }; diff --git a/src/ats/test_ats_api_scheduling.c b/src/ats/test_ats_api_scheduling.c index 892186cd1..686916597 100644 --- a/src/ats/test_ats_api_scheduling.c +++ b/src/ats/test_ats_api_scheduling.c @@ -34,10 +34,6 @@ #include "gnunet_ats_service.h" #include "ats.h" -#define VERBOSE GNUNET_NO - -#define VERBOSE_ARM GNUNET_NO - #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) static GNUNET_SCHEDULER_TaskIdentifier die_task; @@ -158,9 +154,6 @@ start_arm (const char *cfgname) arm_proc = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm", "gnunet-service-arm", -#if VERBOSE_ARM - "-L", "DEBUG", -#endif "-c", cfgname, NULL); } @@ -241,11 +234,7 @@ main (int argc, char *argv[]) static char *const argv2[] = { "test_ats_api_scheduling", "-c", "test_ats_api.conf", -#if VERBOSE - "-L", "DEBUG", -#else "-L", "WARNING", -#endif NULL }; diff --git a/src/ats/test_ats_api_update_address.c b/src/ats/test_ats_api_update_address.c index 2607f536e..19585903f 100644 --- a/src/ats/test_ats_api_update_address.c +++ b/src/ats/test_ats_api_update_address.c @@ -34,10 +34,6 @@ #include "gnunet_ats_service.h" #include "gnunet_transport_service.h" -#define VERBOSE GNUNET_NO - -#define VERBOSE_ARM GNUNET_NO - #define START_ARM GNUNET_YES #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) @@ -277,11 +273,7 @@ main (int argc, char *argv1[]) static char *const argv[] = { "test_ats_api_update_address", "-c", "test_ats_api.conf", -#if VERBOSE - "-L", "DEBUG", -#else "-L", "WARNING", -#endif NULL }; diff --git a/src/ats/test_ats_mlp.c b/src/ats/test_ats_mlp.c index 27e5360b3..c4672103d 100644 --- a/src/ats/test_ats_mlp.c +++ b/src/ats/test_ats_mlp.c @@ -30,9 +30,6 @@ #include "gnunet_ats_service.h" #include "gnunet-service-ats_addresses_mlp.h" -#define VERBOSE GNUNET_YES -#define VERBOSE_ARM GNUNET_NO - #define MLP_MAX_EXEC_DURATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3) #define MLP_MAX_ITERATIONS INT_MAX @@ -179,11 +176,7 @@ main (int argc, char *argv[]) static char *const argv2[] = { "test_ats_mlp", "-c", "test_ats_api.conf", -#if VERBOSE - "-L", "DEBUG", -#else "-L", "WARNING", -#endif NULL }; diff --git a/src/ats/test_ats_mlp_averaging.c b/src/ats/test_ats_mlp_averaging.c index 5eea44631..97e9aa722 100644 --- a/src/ats/test_ats_mlp_averaging.c +++ b/src/ats/test_ats_mlp_averaging.c @@ -30,9 +30,6 @@ #include "gnunet_ats_service.h" #include "gnunet-service-ats_addresses_mlp.h" -#define VERBOSE GNUNET_YES -#define VERBOSE_ARM GNUNET_NO - #define MLP_MAX_EXEC_DURATION GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3) #define MLP_MAX_ITERATIONS INT_MAX @@ -162,11 +159,7 @@ main (int argc, char *argv[]) static char *const argv2[] = { "test_ats_mlp", "-c", "test_ats_api.conf", -#if VERBOSE - "-L", "DEBUG", -#else "-L", "WARNING", -#endif NULL }; -- 2.25.1