From 86418a44da7ca7769b6b8c2bd34293b212c01af2 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 11 Jun 2014 05:57:20 +0000 Subject: [PATCH] -fix log level, logging, indentation --- src/peerinfo/test_peerinfo_shipped_hellos.c | 70 ++++++++++++--------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/src/peerinfo/test_peerinfo_shipped_hellos.c b/src/peerinfo/test_peerinfo_shipped_hellos.c index db61777b0..a7475c5ab 100644 --- a/src/peerinfo/test_peerinfo_shipped_hellos.c +++ b/src/peerinfo/test_peerinfo_shipped_hellos.c @@ -19,7 +19,7 @@ */ /** - * @file peerinfo/test_peerinfo_api.c + * @file peerinfo/test_peerinfo_shipped_hellos.c * @brief testcase for shipped HELLOs getting parsed * @author Christian Grothoff * @author Matthias Wachs @@ -40,17 +40,21 @@ static int global_ret; static int addr_cb (void *cls, - const struct GNUNET_HELLO_Address *address, - struct GNUNET_TIME_Absolute expiration) -{; - int *addr = cls; - (*addr) ++; - return GNUNET_OK; + const struct GNUNET_HELLO_Address *address, + struct GNUNET_TIME_Absolute expiration) +{ + int *addr = cls; + + (*addr) ++; + return GNUNET_OK; } + static void -process (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_HELLO_Message *hello, const char *err_msg) +process (void *cls, + const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_HELLO_Message *hello, + const char *err_msg) { static unsigned int calls = 0; int addr; @@ -62,30 +66,34 @@ process (void *cls, const struct GNUNET_PeerIdentity *peer, } if (NULL != peer) { - addr = 0; - if (NULL != hello) - { - GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &addr_cb, &addr); - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Got information about peer `%s' with %u addresses \n", - GNUNET_i2s (peer), addr); - calls++; - } - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail: Got information about peer `%s' without HELLO \n", - GNUNET_i2s (peer)); + addr = 0; + if (NULL != hello) + { + GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &addr_cb, &addr); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Got information about peer `%s' with %u addresses \n", + GNUNET_i2s (peer), addr); + calls++; + } + else + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Fail: Got information about peer `%s' without HELLO \n", + GNUNET_i2s (peer)); } else { - if (0 == calls) - { - fprintf (stderr, "Failed: %u callbacks\n", calls); - global_ret = 1; - } - else - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got %u callbacks\n", calls); - global_ret = 0; - } + if (0 == calls) + { + fprintf (stderr, + "Failed: got no callbacks!\n"); + global_ret = 1; + } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Got %u callbacks\n", calls); + global_ret = 0; + } } } @@ -107,7 +115,7 @@ int main (int argc, char *argv[]) { global_ret = 3; - if (0 != GNUNET_TESTING_service_run ("test_peerinfo_system_hellos", + if (0 != GNUNET_TESTING_service_run ("test_peerinfo_shipped_hellos", "peerinfo", "test_peerinfo_api_data.conf", &run, NULL)) -- 2.25.1