From 355641eae5d8f883d387d2dd4283200f91402a6a Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Mon, 9 Sep 2013 11:18:53 +0000 Subject: [PATCH] checks for coverity --- .../gnunet-daemon-experimentation_experiments.c | 9 ++++----- .../gnunet-daemon-experimentation_nodes.c | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/experimentation/gnunet-daemon-experimentation_experiments.c b/src/experimentation/gnunet-daemon-experimentation_experiments.c index 891865b39..01d8fa816 100644 --- a/src/experimentation/gnunet-daemon-experimentation_experiments.c +++ b/src/experimentation/gnunet-daemon-experimentation_experiments.c @@ -86,7 +86,7 @@ int free_experiment (void *cls, void *value) { struct Experiment *e = value; - GNUNET_CONTAINER_multihashmap_remove (experiments, key, value); + GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_remove (experiments, key, value)); GNUNET_free_non_null (e->description); GNUNET_free_non_null (e->name); GNUNET_free (e); @@ -107,7 +107,7 @@ int free_issuer (void *cls, void *value) { struct Issuer *i = value; - GNUNET_CONTAINER_multihashmap_remove (valid_issuers, key, value); + GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_remove (valid_issuers, key, value)); GNUNET_free (i); return GNUNET_OK; } @@ -354,9 +354,8 @@ void exp_file_iterator (void *cls, /* Optional fields */ /* Description */ - GNUNET_CONFIGURATION_get_value_string (exp, name, "DESCRIPTION", &description); - - + if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (exp, name, "DESCRIPTION", &description)) + description = NULL; if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "START", (long long unsigned int *) &start.abs_value_us)) start = GNUNET_TIME_UNIT_ZERO_ABS; diff --git a/src/experimentation/gnunet-daemon-experimentation_nodes.c b/src/experimentation/gnunet-daemon-experimentation_nodes.c index 14d25b6c9..a4da92d50 100644 --- a/src/experimentation/gnunet-daemon-experimentation_nodes.c +++ b/src/experimentation/gnunet-daemon-experimentation_nodes.c @@ -148,7 +148,7 @@ cleanup_node (void *cls, GNUNET_free_non_null (n->issuer_id); - GNUNET_CONTAINER_multihashmap_remove (cur, key, value); + GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_remove (cur, key, value)); GNUNET_free (value); return GNUNET_OK; } @@ -242,7 +242,7 @@ remove_request (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (nodes_requested, &n->id.hashPubKey)) { - GNUNET_CONTAINER_multihashmap_remove (nodes_requested, &n->id.hashPubKey, n); + GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_remove (nodes_requested, &n->id.hashPubKey, n)); update_stats (nodes_requested); GNUNET_CONTAINER_multihashmap_put (nodes_inactive, &n->id.hashPubKey, n, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); @@ -268,7 +268,7 @@ size_t send_experimentation_request_cb (void *cls, size_t bufsize, void *buf) size_t ri_size = sizeof (struct Experimentation_Issuer) * GSE_my_issuer_count; size_t total_size = msg_size + ri_size; - memset (buf, '0', bufsize); + memset (buf, '\0', bufsize); n->cth = NULL; if (buf == NULL) { @@ -479,7 +479,7 @@ static void handle_request (const struct GNUNET_PeerIdentity *peer, } else if (NULL != (n = GNUNET_CONTAINER_multihashmap_get (nodes_inactive, &peer->hashPubKey))) { - GNUNET_CONTAINER_multihashmap_remove (nodes_inactive, &peer->hashPubKey, n); + GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_remove (nodes_inactive, &peer->hashPubKey, n)); update_stats (nodes_inactive); make_active = GNUNET_YES; } @@ -586,7 +586,7 @@ static void handle_response (const struct GNUNET_PeerIdentity *peer, { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %s from peer `%s'\n", "RESPONSE", "inactive", GNUNET_i2s (peer)); - GNUNET_CONTAINER_multihashmap_remove (nodes_inactive, &peer->hashPubKey, n); + GNUNET_break (0 == GNUNET_CONTAINER_multihashmap_remove (nodes_inactive, &peer->hashPubKey, n)); update_stats (nodes_inactive); make_active = GNUNET_YES; } -- 2.25.1