[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27548 - in gnunet/src: testbed testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27548 - in gnunet/src: testbed testing |
Date: |
Mon, 24 Jun 2013 14:47:41 +0200 |
Author: harsha
Date: 2013-06-24 14:47:41 +0200 (Mon, 24 Jun 2013)
New Revision: 27548
Modified:
gnunet/src/testbed/gnunet-service-testbed-logger.c
gnunet/src/testbed/gnunet-service-testbed_cache.c
gnunet/src/testbed/gnunet-service-testbed_cpustatus.c
gnunet/src/testbed/gnunet-service-testbed_peers.c
gnunet/src/testbed/testbed_api_hosts.c
gnunet/src/testbed/testbed_api_operations.c
gnunet/src/testbed/testbed_api_testbed.c
gnunet/src/testing/gnunet-testing-run-service.c
gnunet/src/testing/testing.c
Log:
- coverity fixes
Modified: gnunet/src/testbed/gnunet-service-testbed-logger.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed-logger.c 2013-06-24 12:12:11 UTC
(rev 27547)
+++ gnunet/src/testbed/gnunet-service-testbed-logger.c 2013-06-24 12:47:41 UTC
(rev 27548)
@@ -201,7 +201,7 @@
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 @@
{
LOG (GNUNET_ERROR_TYPE_ERROR, "Cannot get hostname. Exiting\n");
GNUNET_free (hname);
+ GNUNET_free (dir);
GNUNET_SCHEDULER_shutdown ();
return;
}
Modified: gnunet/src/testbed/gnunet-service-testbed_cache.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_cache.c 2013-06-24 12:12:11 UTC
(rev 27547)
+++ gnunet/src/testbed/gnunet-service-testbed_cache.c 2013-06-24 12:47:41 UTC
(rev 27548)
@@ -838,7 +838,7 @@
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 @@
}
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);
}
}
Modified: gnunet/src/testbed/gnunet-service-testbed_cpustatus.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_cpustatus.c 2013-06-24
12:12:11 UTC (rev 27547)
+++ gnunet/src/testbed/gnunet-service-testbed_cpustatus.c 2013-06-24
12:47:41 UTC (rev 27548)
@@ -672,11 +672,11 @@
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,
Modified: gnunet/src/testbed/gnunet-service-testbed_peers.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_peers.c 2013-06-24 12:12:11 UTC
(rev 27547)
+++ gnunet/src/testbed/gnunet-service-testbed_peers.c 2013-06-24 12:47:41 UTC
(rev 27548)
@@ -1273,8 +1273,12 @@
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 @@
"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);
Modified: gnunet/src/testbed/testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.c 2013-06-24 12:12:11 UTC (rev
27547)
+++ gnunet/src/testbed/testbed_api_hosts.c 2013-06-24 12:47:41 UTC (rev
27548)
@@ -1086,8 +1086,7 @@
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",
Modified: gnunet/src/testbed/testbed_api_operations.c
===================================================================
--- gnunet/src/testbed/testbed_api_operations.c 2013-06-24 12:12:11 UTC (rev
27547)
+++ gnunet/src/testbed/testbed_api_operations.c 2013-06-24 12:47:41 UTC (rev
27548)
@@ -497,8 +497,12 @@
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;
}
Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c 2013-06-24 12:12:11 UTC (rev
27547)
+++ gnunet/src/testbed/testbed_api_testbed.c 2013-06-24 12:47:41 UTC (rev
27548)
@@ -1301,6 +1301,7 @@
"OVERLAY_TOPOLOGY_FILE");
goto error_cleanup;
}
+ break;
default:
/* Warn if OVERLAY_RANDOM_LINKS is present that it will be ignored */
if (GNUNET_YES ==
Modified: gnunet/src/testing/gnunet-testing-run-service.c
===================================================================
--- gnunet/src/testing/gnunet-testing-run-service.c 2013-06-24 12:12:11 UTC
(rev 27547)
+++ gnunet/src/testing/gnunet-testing-run-service.c 2013-06-24 12:47:41 UTC
(rev 27548)
@@ -116,8 +116,8 @@
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;
Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c 2013-06-24 12:12:11 UTC (rev 27547)
+++ gnunet/src/testing/testing.c 2013-06-24 12:47:41 UTC (rev 27548)
@@ -512,7 +512,9 @@
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27548 - in gnunet/src: testbed testing,
gnunet <=