From 1e007a89197769e4e0f5ad36b583689a27f33cac Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Mon, 24 Jun 2013 12:47:41 +0000 Subject: - coverity fixes --- src/testbed/gnunet-service-testbed-logger.c | 3 ++- src/testbed/gnunet-service-testbed_cache.c | 6 ++---- src/testbed/gnunet-service-testbed_cpustatus.c | 4 ++-- src/testbed/gnunet-service-testbed_peers.c | 6 ++++++ src/testbed/testbed_api_hosts.c | 3 +-- src/testbed/testbed_api_operations.c | 8 ++++++-- src/testbed/testbed_api_testbed.c | 1 + src/testing/gnunet-testing-run-service.c | 4 ++-- src/testing/testing.c | 4 +++- 9 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/testbed/gnunet-service-testbed-logger.c b/src/testbed/gnunet-service-testbed-logger.c index fd5c49ecc..3923ae289 100644 --- a/src/testbed/gnunet-service-testbed-logger.c +++ b/src/testbed/gnunet-service-testbed-logger.c @@ -201,7 +201,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_CONTAINER_DLL_remove (mq_head, mq_tail, mq_entry); GNUNET_free (mq_entry); } - GNUNET_BIO_write_close (bio); + (void) GNUNET_BIO_write_close (bio); } @@ -241,6 +241,7 @@ logger_run (void *cls, struct GNUNET_SERVER_Handle *server, { LOG (GNUNET_ERROR_TYPE_ERROR, "Cannot get hostname. Exiting\n"); GNUNET_free (hname); + GNUNET_free (dir); GNUNET_SCHEDULER_shutdown (); return; } diff --git a/src/testbed/gnunet-service-testbed_cache.c b/src/testbed/gnunet-service-testbed_cache.c index 1022c0959..6423f81aa 100644 --- a/src/testbed/gnunet-service-testbed_cache.c +++ b/src/testbed/gnunet-service-testbed_cache.c @@ -838,7 +838,7 @@ cache_clear_iterator (void *cls, const struct GNUNET_HashCode *key, void *value) GNUNET_assert (NULL != entry); GNUNET_break (0 == entry->demand); LOG_DEBUG ("Clearing entry %u of %u\n", ++ncleared, cache_size); - GNUNET_CONTAINER_multihashmap_remove (cache, key, value); + (void) GNUNET_CONTAINER_multihashmap_remove (cache, key, value); close_handles (entry); GNUNET_free_non_null (entry->hello); GNUNET_break (GNUNET_SCHEDULER_NO_TASK == entry->expire_task); @@ -933,9 +933,7 @@ GST_cache_get_handle_done (struct GSTCacheGetHandle *cgh) } else { - struct GSTCacheGetHandle *cgh2; - - if (NULL != (cgh2 = search_suitable_cgh (entry, entry->cgh_qhead))) + if (NULL != search_suitable_cgh (entry, entry->cgh_qhead)) entry->notify_task = GNUNET_SCHEDULER_add_now (&call_cgh_cb, entry); } } diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c index 6caea9761..8145410fb 100644 --- a/src/testbed/gnunet-service-testbed_cpustatus.c +++ b/src/testbed/gnunet-service-testbed_cpustatus.c @@ -672,11 +672,11 @@ sample_load_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) if (0 < nbs) { GNUNET_BIO_write (bw, str, nbs); - GNUNET_free (str); } else GNUNET_break (0); - + GNUNET_free (str); + reschedule: sample_load_task_id = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, diff --git a/src/testbed/gnunet-service-testbed_peers.c b/src/testbed/gnunet-service-testbed_peers.c index 34c1bf085..4fb6b2f80 100644 --- a/src/testbed/gnunet-service-testbed_peers.c +++ b/src/testbed/gnunet-service-testbed_peers.c @@ -1273,8 +1273,12 @@ shutdown_peers_timeout_cb (void *cls, GNUNET_assert (0 < hc->nslaves); hc->nslaves--; if (0 == hc->nslaves) + { GST_send_operation_fail_msg (fo_ctxt->client, fo_ctxt->operation_id, "Timeout at a slave controller"); + GNUNET_free (hc); + hc = NULL; + } GNUNET_TESTBED_forward_operation_msg_cancel_ (fo_ctxt->opc); GNUNET_SERVER_client_drop (fo_ctxt->client); GNUNET_CONTAINER_DLL_remove (fopcq_head, fopcq_tail, fo_ctxt); @@ -1313,6 +1317,8 @@ shutdown_peers_reply_cb (void *cls, "Timeout at a slave controller"); else GST_send_operation_success_msg (fo_ctxt->client, fo_ctxt->operation_id); + GNUNET_free (hc); + hc = NULL; } GNUNET_SERVER_client_drop (fo_ctxt->client); GNUNET_CONTAINER_DLL_remove (fopcq_head, fopcq_tail, fo_ctxt); diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 2593f5ff8..bb6197e9a 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c @@ -1086,8 +1086,7 @@ helper_mst (void *cls, void *client, const struct GNUNET_MessageHeader *message) GNUNET_assert (GNUNET_CONFIGURATION_deserialize (cp->host->cfg, config, config_size, GNUNET_NO)); GNUNET_free (config); - if ((NULL == cp->host) || - (NULL == (hostname = GNUNET_TESTBED_host_get_hostname (cp->host)))) + if (NULL == (hostname = GNUNET_TESTBED_host_get_hostname (cp->host))) hostname = "localhost"; /* Change the hostname so that we can connect to it */ GNUNET_CONFIGURATION_set_value_string (cp->host->cfg, "testbed", "hostname", diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c index 47d135ffd..62bd59748 100644 --- a/src/testbed/testbed_api_operations.c +++ b/src/testbed/testbed_api_operations.c @@ -497,8 +497,12 @@ decide_capacity (struct OperationQueue *opq, ret: GNUNET_free_non_null (evict_entries); - if (NULL != ops_) *ops_ = ops; - if (NULL != n_ops_) *n_ops_ = n_ops; + if (NULL != ops_) + *ops_ = ops; + else + GNUNET_free (ops); + if (NULL != n_ops_) + *n_ops_ = n_ops; return rval; } diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c index 8e3a1073e..4d5768af6 100644 --- a/src/testbed/testbed_api_testbed.c +++ b/src/testbed/testbed_api_testbed.c @@ -1301,6 +1301,7 @@ GNUNET_TESTBED_run (const char *host_filename, "OVERLAY_TOPOLOGY_FILE"); goto error_cleanup; } + break; default: /* Warn if OVERLAY_RANDOM_LINKS is present that it will be ignored */ if (GNUNET_YES == diff --git a/src/testing/gnunet-testing-run-service.c b/src/testing/gnunet-testing-run-service.c index ed60a409b..b967d7385 100644 --- a/src/testing/gnunet-testing-run-service.c +++ b/src/testing/gnunet-testing-run-service.c @@ -116,8 +116,8 @@ stdin_cb (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_SCHEDULER_shutdown (); return; case 'r': - GNUNET_TESTING_peer_stop (my_peer); - GNUNET_TESTING_peer_start (my_peer); + (void) GNUNET_TESTING_peer_stop (my_peer); + (void) GNUNET_TESTING_peer_start (my_peer); printf ("restarted\n"); fflush (stdout); break; diff --git a/src/testing/testing.c b/src/testing/testing.c index d73d5ece3..898af1674 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c @@ -512,7 +512,9 @@ static void stop_shared_service_instance (struct SharedServiceInstance *i) { GNUNET_break (0 == i->n_refs); - GNUNET_OS_process_kill (i->proc, SIGTERM); + if (0 != GNUNET_OS_process_kill (i->proc, SIGTERM)) + LOG (GNUNET_ERROR_TYPE_WARNING, + "Killing shared service instance (%s) failed\n", i->ss->sname); (void) GNUNET_OS_process_wait (i->proc); GNUNET_OS_process_destroy (i->proc); i->proc = NULL; -- cgit v1.2.3