summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-05-31 21:03:50 +0000
committerChristian Grothoff <christian@grothoff.org>2012-05-31 21:03:50 +0000
commitadc1b1fe5b4e1a000d20e29dd605e0060545c0ab (patch)
tree4b1e6185ca2044b4c7998340545ae7e3c7e6e774 /src
parentbc071cd50ad7d58e7ce2e6e5d535eedb084b3361 (diff)
-fixing compiler warnings on FreeBSD
Diffstat (limited to 'src')
-rw-r--r--src/transport/test_transport_api.c35
-rw-r--r--src/transport/test_transport_api_blacklisting.c18
2 files changed, 19 insertions, 34 deletions
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index ceba9c3c7..f944fac61 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -37,8 +37,6 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
@@ -52,9 +50,9 @@
*/
#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-#define MSIZE 2600
+#define TEST_MESSAGE_SIZE 2600
-#define MTYPE 12345
+#define TEST_MESSAGE_TYPE 12345
static char *test_source;
@@ -88,11 +86,6 @@ static char *cfg_file_p1;
static char *cfg_file_p2;
-#if VERBOSE
-#define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
-#else
-#define OKPP do { ok++; } while (0)
-#endif
static void
end ()
@@ -188,8 +181,8 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
GNUNET_i2s (&t->id));
GNUNET_free (ps);
- if ((MTYPE == ntohs (message->type)) &&
- (MSIZE == ntohs (message->size)))
+ if ((TEST_MESSAGE_TYPE == ntohs (message->type)) &&
+ (TEST_MESSAGE_SIZE == ntohs (message->size)))
{
ok = 0;
end ();
@@ -222,13 +215,13 @@ notify_ready (void *cls, size_t size, void *buf)
return 0;
}
- GNUNET_assert (size >= MSIZE);
+ GNUNET_assert (size >= TEST_MESSAGE_SIZE);
if (buf != NULL)
{
- memset (buf, '\0', MSIZE);
+ memset (buf, '\0', TEST_MESSAGE_SIZE);
hdr = buf;
- hdr->size = htons (MSIZE);
- hdr->type = htons (MTYPE);
+ hdr->size = htons (TEST_MESSAGE_SIZE);
+ hdr->type = htons (TEST_MESSAGE_TYPE);
}
char *ps = GNUNET_strdup (GNUNET_i2s (&p2->id));
@@ -238,7 +231,7 @@ notify_ready (void *cls, size_t size, void *buf)
GNUNET_i2s (&p->id));
GNUNET_free (ps);
- return MSIZE;
+ return TEST_MESSAGE_SIZE;
}
@@ -256,7 +249,7 @@ sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s);
GNUNET_free (receiver_s);
s_sending = GNUNET_YES;
- th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, MSIZE, 0,
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, TEST_MESSAGE_SIZE, 0,
TIMEOUT_TRANSMIT, &notify_ready,
p1);
}
@@ -384,9 +377,6 @@ check ()
static char *const argv[] = { "test-transport-api",
"-c",
"test_transport_api_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
NULL
};
static struct GNUNET_GETOPT_CommandLineOption options[] = {
@@ -416,13 +406,8 @@ main (int argc, char *argv[])
&test_plugin);
GNUNET_log_setup (test_name,
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
-#endif
NULL);
-
tth = GNUNET_TRANSPORT_TESTING_init ();
GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1);
diff --git a/src/transport/test_transport_api_blacklisting.c b/src/transport/test_transport_api_blacklisting.c
index f8f6040a9..909ea57d4 100644
--- a/src/transport/test_transport_api_blacklisting.c
+++ b/src/transport/test_transport_api_blacklisting.c
@@ -61,9 +61,9 @@ struct GNUNET_TRANSPORT_TESTING_handle *tth;
*/
#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
-#define MSIZE 2600
+#define TEST_MESSAGE_SIZE 2600
-#define MTYPE 12345
+#define TEST_MESSAGE_TYPE 12345
static int ok;
@@ -212,8 +212,8 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
GNUNET_i2s (&t->id));
GNUNET_free (ps);
- if ((MTYPE == ntohs (message->type)) &&
- (MSIZE == ntohs (message->size)))
+ if ((TEST_MESSAGE_TYPE == ntohs (message->type)) &&
+ (TEST_MESSAGE_SIZE == ntohs (message->size)))
{
ok = 0;
shutdown_task = GNUNET_SCHEDULER_add_now(&end, NULL);
@@ -249,13 +249,13 @@ notify_ready (void *cls, size_t size, void *buf)
return 0;
}
- GNUNET_assert (size >= MSIZE);
+ GNUNET_assert (size >= TEST_MESSAGE_SIZE);
if (buf != NULL)
{
hdr = buf;
- hdr->size = htons (MSIZE);
- hdr->type = htons (MTYPE);
+ hdr->size = htons (TEST_MESSAGE_SIZE);
+ hdr->type = htons (TEST_MESSAGE_TYPE);
}
char *ps = GNUNET_strdup (GNUNET_i2s (&p2->id));
@@ -265,7 +265,7 @@ notify_ready (void *cls, size_t size, void *buf)
GNUNET_i2s (&p->id));
GNUNET_free (ps);
- return MSIZE;
+ return TEST_MESSAGE_SIZE;
}
static void
@@ -282,7 +282,7 @@ sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s);
GNUNET_free (receiver_s);
- th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, MSIZE, 0,
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, TEST_MESSAGE_SIZE, 0,
TIMEOUT_TRANSMIT, &notify_ready,
p1);
}