From f5f5a9f680df2cebe6435ec87650cb3cb6e3ef6e Mon Sep 17 00:00:00 2001 From: Julius Bünger Date: Fri, 26 Apr 2019 05:56:54 +0200 Subject: memcmp() -> GNUNET_memcmp(), first take --- src/ats/ats_api_performance.c | 7 +++---- src/ats/ats_api_scheduling.c | 10 ++++------ src/ats/gnunet-ats-solver-eval.c | 2 +- src/ats/gnunet-service-ats-new.c | 5 ++--- src/ats/gnunet-service-ats_addresses.c | 4 +--- src/ats/gnunet-service-ats_normalization.c | 5 ++--- src/ats/plugin_ats2_simple.c | 5 ++--- src/ats/plugin_ats_mlp.c | 4 ++-- src/ats/plugin_ats_ril.c | 2 +- src/ats/test_ats_lib.c | 5 ++--- 10 files changed, 20 insertions(+), 29 deletions(-) (limited to 'src/ats') diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c index 12dec776e..0954c02d5 100644 --- a/src/ats/ats_api_performance.c +++ b/src/ats/ats_api_performance.c @@ -383,9 +383,8 @@ handle_reservation_result (void *cls, amount = ntohl (rr->amount); rc = ph->reservation_head; - if (0 != memcmp (&rr->peer, - &rc->peer, - sizeof(struct GNUNET_PeerIdentity))) + if (0 != GNUNET_memcmp (&rr->peer, + &rc->peer)) { GNUNET_break(0); reconnect (ph); @@ -498,7 +497,7 @@ handle_address_list (void *cls, return; /* was canceled */ memset (&allzeros, '\0', sizeof (allzeros)); - if ( (0 == memcmp (&allzeros, &pi->peer, sizeof(allzeros))) && + if ( (0 == GNUNET_is_zero (&pi->peer)) && (0 == plugin_name_length) && (0 == plugin_address_length) ) { diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c index 3c8ad9b9a..532426e91 100644 --- a/src/ats/ats_api_scheduling.c +++ b/src/ats/ats_api_scheduling.c @@ -230,9 +230,8 @@ find_session (struct GNUNET_ATS_SchedulingHandle *sh, as we communicate asynchronously with the ATS service. */ return NULL; } - if (0 != memcmp (peer, - &ar->address->peer, - sizeof (struct GNUNET_PeerIdentity))) + if (0 != GNUNET_memcmp (peer, + &ar->address->peer)) { GNUNET_break (0); return NULL; @@ -298,9 +297,8 @@ find_session_id (struct GNUNET_ATS_SchedulingHandle *sh, (GNUNET_NO == sh->session_array[i]->in_destroy) && ( (session == sh->session_array[i]->session) || (NULL == sh->session_array[i]->session) ) && - (0 == memcmp (&address->peer, - &sh->session_array[i]->address->peer, - sizeof (struct GNUNET_PeerIdentity))) && + (0 == GNUNET_memcmp (&address->peer, + &sh->session_array[i]->address->peer)) && (0 == GNUNET_HELLO_address_cmp (address, sh->session_array[i]->address)) ) return i; diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c index 62e09533f..833cb9ded 100644 --- a/src/ats/gnunet-ats-solver-eval.c +++ b/src/ats/gnunet-ats-solver-eval.c @@ -122,7 +122,7 @@ find_peer_by_pid (const struct GNUNET_PeerIdentity *pid) { struct TestPeer *cur; for (cur = peer_head; NULL != cur; cur = cur->next) - if (0 == memcmp (&cur->peer_id, pid, sizeof (struct GNUNET_PeerIdentity))) + if (0 == GNUNET_memcmp (&cur->peer_id, pid)) return cur; return NULL; } diff --git a/src/ats/gnunet-service-ats-new.c b/src/ats/gnunet-service-ats-new.c index f2bc1de7f..b451c8c67 100644 --- a/src/ats/gnunet-service-ats-new.c +++ b/src/ats/gnunet-service-ats-new.c @@ -362,9 +362,8 @@ handle_suggest_cancel (void *cls, cp = cp->next) if ( (cp->pref.pk == (enum GNUNET_MQ_PreferenceKind) ntohl (msg->pk)) && (cp->pref.bw.value__ == msg->bw.value__) && - (0 == memcmp (&cp->pref.peer, - &msg->peer, - sizeof (struct GNUNET_PeerIdentity))) ) + (0 == GNUNET_memcmp (&cp->pref.peer, + &msg->peer)) ) break; if (NULL == cp) { diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index dd5cee96f..efe968024 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c @@ -682,9 +682,7 @@ GAS_handle_request_address_list (struct GNUNET_SERVICE_Client *client, memset (&allzeros, '\0', sizeof (struct GNUNET_PeerIdentity)); - if (0 == memcmp (&alrm->peer, - &allzeros, - sizeof (struct GNUNET_PeerIdentity))) + if (0 == GNUNET_is_zero (&alrm->peer)) { /* Return addresses for all peers */ GAS_addresses_get_peer_info (NULL, diff --git a/src/ats/gnunet-service-ats_normalization.c b/src/ats/gnunet-service-ats_normalization.c index f68e6ec11..4b58bf9b7 100644 --- a/src/ats/gnunet-service-ats_normalization.c +++ b/src/ats/gnunet-service-ats_normalization.c @@ -250,9 +250,8 @@ GAS_normalization_update_property (struct ATS_Address *address) GNUNET_CONTAINER_multipeermap_iterate (GSA_addresses, &find_min_max_it, &range); - if (0 != memcmp (&range, - &property_range, - sizeof (struct PropertyRange))) + if (0 != GNUNET_memcmp (&range, + &property_range)) { /* limits changed, (re)normalize all addresses */ property_range = range; diff --git a/src/ats/plugin_ats2_simple.c b/src/ats/plugin_ats2_simple.c index 449b50fb7..35a256f32 100644 --- a/src/ats/plugin_ats2_simple.c +++ b/src/ats/plugin_ats2_simple.c @@ -492,9 +492,8 @@ watch_cb (void *cls, struct GNUNET_TIME_Absolute expiration; struct Hello *hello; - if (0 != memcmp (&p->pid, - &record->peer, - sizeof (struct GNUNET_PeerIdentity))) + if (0 != GNUNET_memcmp (&p->pid, + &record->peer)) { GNUNET_break (0); return; diff --git a/src/ats/plugin_ats_mlp.c b/src/ats/plugin_ats_mlp.c index 8e7880793..0f3a727a7 100644 --- a/src/ats/plugin_ats_mlp.c +++ b/src/ats/plugin_ats_mlp.c @@ -1401,7 +1401,7 @@ mlp_propagate_results (void *cls, mlpi->b_in = mlp_bw_in; address->assigned_bw_out = mlp_bw_out; mlpi->b_out = mlp_bw_out; - if ((NULL == mlp->exclude_peer) || (0 != memcmp (&address->peer, mlp->exclude_peer, sizeof (address->peer)))) + if ((NULL == mlp->exclude_peer) || (0 != GNUNET_memcmp (&address->peer, mlp->exclude_peer))) mlp->env->bandwidth_changed_cb (mlp->env->cls, address); return GNUNET_OK; } @@ -1417,7 +1417,7 @@ mlp_propagate_results (void *cls, mlpi->b_in = mlp_bw_in; address->assigned_bw_out = mlp_bw_out; mlpi->b_out = mlp_bw_out; - if ((NULL == mlp->exclude_peer) || (0 != memcmp (&address->peer, mlp->exclude_peer, sizeof (address->peer)))) + if ((NULL == mlp->exclude_peer) || (0 != GNUNET_memcmp (&address->peer, mlp->exclude_peer))) mlp->env->bandwidth_changed_cb (mlp->env->cls, address); return GNUNET_OK; } diff --git a/src/ats/plugin_ats_ril.c b/src/ats/plugin_ats_ril.c index 6e55f3a1c..9f78450c2 100644 --- a/src/ats/plugin_ats_ril.c +++ b/src/ats/plugin_ats_ril.c @@ -2016,7 +2016,7 @@ ril_get_agent (struct GAS_RIL_Handle *solver, const struct GNUNET_PeerIdentity * for (cur = solver->agents_head; NULL != cur; cur = cur->next) { - if (0 == memcmp (peer, &cur->peer, sizeof(struct GNUNET_PeerIdentity))) + if (0 == GNUNET_memcmp (peer, &cur->peer)) { return cur; } diff --git a/src/ats/test_ats_lib.c b/src/ats/test_ats_lib.c index 21eca18e9..33597e678 100644 --- a/src/ats/test_ats_lib.c +++ b/src/ats/test_ats_lib.c @@ -540,9 +540,8 @@ reservation_cb (void *cls, cmd->details.reserve_bandwidth.rc = NULL; make_peer (cmd->details.reserve_bandwidth.pid, &pid); - GNUNET_assert (0 == memcmp (peer, - &pid, - sizeof (struct GNUNET_PeerIdentity))); + GNUNET_assert (0 == GNUNET_memcmp (peer, + &pid)); switch (cmd->details.reserve_bandwidth.expected_result) { case GNUNET_OK: -- cgit v1.2.3