From 162fbcf543a045b2046cbe8bfe5113c12fa22105 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Thu, 26 Jan 2012 13:23:49 +0000 Subject: [PATCH] cppcheck --- src/ats/ats_api.c | 8 -------- src/ats/gnunet-service-ats_addresses_mlp.c | 17 ++++++++--------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/ats/ats_api.c b/src/ats/ats_api.c index 7c0fb2d32..82eede9dc 100644 --- a/src/ats/ats_api.c +++ b/src/ats/ats_api.c @@ -252,14 +252,6 @@ suggest_address (void *cls, const GNUNET_HashCode * key, void *value) return GNUNET_NO; } - -int -map_it (void *cls, const GNUNET_HashCode * key, void *value) -{ - LOG (GNUNET_ERROR_TYPE_DEBUG, "Found entry for %s\n", GNUNET_h2s (key)); - return GNUNET_YES; -} - /** * We would like to establish a new connection with a peer. * ATS should suggest a good address to begin with. diff --git a/src/ats/gnunet-service-ats_addresses_mlp.c b/src/ats/gnunet-service-ats_addresses_mlp.c index 3c57110f5..602925e1f 100644 --- a/src/ats/gnunet-service-ats_addresses_mlp.c +++ b/src/ats/gnunet-service-ats_addresses_mlp.c @@ -1418,6 +1418,8 @@ GAS_mlp_done (struct GAS_MLP_Handle *mlp) struct ATS_Peer * peer; struct ATS_Peer * tmp; + GNUNET_assert (mlp != NULL); + if (mlp->mlp_task != GNUNET_SCHEDULER_NO_TASK) { GNUNET_SCHEDULER_cancel(mlp->mlp_task); @@ -1425,16 +1427,13 @@ GAS_mlp_done (struct GAS_MLP_Handle *mlp) } /* clean up peer list */ - if (mlp != NULL) + peer = mlp->peer_head; + while (peer != NULL) { - peer = mlp->peer_head; - while (peer != NULL) - { - GNUNET_CONTAINER_DLL_remove(mlp->peer_head, mlp->peer_tail, peer); - tmp = peer->next; - GNUNET_free (peer); - peer = tmp; - } + GNUNET_CONTAINER_DLL_remove(mlp->peer_head, mlp->peer_tail, peer); + tmp = peer->next; + GNUNET_free (peer); + peer = tmp; } mlp_delete_problem (mlp); -- 2.25.1