From ca0050772a26fc9251d83146ef9b05b0b56069a9 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 6 Feb 2015 09:37:01 +0000 Subject: [PATCH] -fixing silly NPEs --- src/ats/test_ats_solver_add_address_and_request.c | 2 +- src/ats/test_ats_solver_alternative_after_delete_address.c | 7 +++---- src/ats/test_ats_solver_request_and_delete_address.c | 7 +++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/ats/test_ats_solver_add_address_and_request.c b/src/ats/test_ats_solver_add_address_and_request.c index 6d63cd990..39ffa18ef 100644 --- a/src/ats/test_ats_solver_add_address_and_request.c +++ b/src/ats/test_ats_solver_add_address_and_request.c @@ -154,7 +154,7 @@ address_suggest_cb (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Received sugggestion for peer `%s'\n", - GNUNET_i2s (&address->peer)); + GNUNET_i2s (peer)); GNUNET_SCHEDULER_add_now (&end, NULL); } diff --git a/src/ats/test_ats_solver_alternative_after_delete_address.c b/src/ats/test_ats_solver_alternative_after_delete_address.c index 907ecbfcb..5c01bd2de 100644 --- a/src/ats/test_ats_solver_alternative_after_delete_address.c +++ b/src/ats/test_ats_solver_alternative_after_delete_address.c @@ -191,9 +191,8 @@ address_suggest_cb (void *cls, struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in) { GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Received a sugggestion for peer `%s' : `%s'\n", - GNUNET_i2s (&address->peer), (char *) address->address); - + "Received a sugggestion for peer `%s'\n", + GNUNET_i2s (peer)); if (GNUNET_NO == first_address_suggested) { if (NULL == first_suggestion) @@ -214,7 +213,7 @@ address_suggest_cb (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Received 1st sugggestion for peer `%s' : `%s'\n", - GNUNET_i2s (&address->peer), (char *) address->address); + GNUNET_i2s (&address->peer), (char *) address->address); first_suggestion = GNUNET_HELLO_address_copy (address); first_address_suggested = GNUNET_YES; diff --git a/src/ats/test_ats_solver_request_and_delete_address.c b/src/ats/test_ats_solver_request_and_delete_address.c index b4ff87828..337285673 100644 --- a/src/ats/test_ats_solver_request_and_delete_address.c +++ b/src/ats/test_ats_solver_request_and_delete_address.c @@ -155,8 +155,8 @@ address_suggest_cb (void *cls, GNUNET_assert (ntohl(bandwidth_out.value__) > 0); GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Received sugggestion for peer `%s', deleting address\n", - GNUNET_i2s (&address->peer)); + "Received sugggestion for peer `%s', deleting address\n", + GNUNET_i2s (&address->peer)); address_deleted = GNUNET_YES; /* Destroying address and wait for disconnect suggestion */ GNUNET_ATS_address_destroy (ar); @@ -165,10 +165,9 @@ address_suggest_cb (void *cls, else { /* Expecting disconnect */ - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Received sugggestion for peer `%s': %u %u\n", - GNUNET_i2s (&address->peer), + GNUNET_i2s (peer), (unsigned int) ntohl (bandwidth_in.value__), (unsigned int) ntohl (bandwidth_out.value__)); -- 2.25.1