From 3fd8c038f6b42cd13f20fa82ce2f130d258366c0 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 7 Nov 2015 00:06:26 +0000 Subject: -some code cleanup (indentation, redundant branches, etc.) --- src/transport/test_transport_api_restart_1peer.c | 37 ++++++++++++++---------- 1 file changed, 22 insertions(+), 15 deletions(-) (limited to 'src/transport/test_transport_api_restart_1peer.c') diff --git a/src/transport/test_transport_api_restart_1peer.c b/src/transport/test_transport_api_restart_1peer.c index 2c4382e9c..86eb299ef 100644 --- a/src/transport/test_transport_api_restart_1peer.c +++ b/src/transport/test_transport_api_restart_1peer.c @@ -225,7 +225,7 @@ notify_ready (void *cls, size_t size, void *buf) th = NULL; - if (buf == NULL) + if (NULL == buf) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout occurred while waiting for transmit_ready\n"); @@ -237,20 +237,23 @@ notify_ready (void *cls, size_t size, void *buf) } GNUNET_assert (size >= 256); + hdr = buf; + hdr->size = htons (sizeof (struct GNUNET_MessageHeader)); + hdr->type = htons (MTYPE); - if (buf != NULL) { - hdr = buf; - hdr->size = htons (sizeof (struct GNUNET_MessageHeader)); - hdr->type = htons (MTYPE); + char *ps = GNUNET_strdup (GNUNET_i2s (&p2->id)); + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Peer %u (`%4s') sending message with type %u and size %u bytes to peer %u (`%4s')\n", + p2->no, + ps, + ntohs (hdr->type), + ntohs (hdr->size), + p->no, + GNUNET_i2s (&p->id)); + GNUNET_free (ps); } - char *ps = GNUNET_strdup (GNUNET_i2s (&p2->id)); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer %u (`%4s') sending message with type %u and size %u bytes to peer %u (`%4s')\n", - p2->no, ps, ntohs (hdr->type), ntohs (hdr->size), p->no, - GNUNET_i2s (&p->id)); - GNUNET_free (ps); return sizeof (struct GNUNET_MessageHeader); } @@ -269,14 +272,18 @@ 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, 256, - TIMEOUT_TRANSMIT, ¬ify_ready, + th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, + &p1->id, + 256, + TIMEOUT_TRANSMIT, + ¬ify_ready, p1); } static void -notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) +notify_connect (void *cls, + const struct GNUNET_PeerIdentity *peer) { static int c; -- cgit v1.2.3