diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-12-03 17:31:48 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-12-03 17:31:48 +0000 |
commit | 3497cf2a8e182972cf217e38f9c762f7df4cec2f (patch) | |
tree | e663f19307964d9417d5dcf987176c3c858ef2a3 /src/testbed/testbed_api_testbed.c | |
parent | ac1843fcf0e0bda117d02c6ffbf976a11f379a35 (diff) | |
download | gnunet-3497cf2a8e182972cf217e38f9c762f7df4cec2f.tar.gz gnunet-3497cf2a8e182972cf217e38f9c762f7df4cec2f.zip |
- remove duplicate functions
Diffstat (limited to 'src/testbed/testbed_api_testbed.c')
-rw-r--r-- | src/testbed/testbed_api_testbed.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c index 0c3805ae6..c4a409b89 100644 --- a/src/testbed/testbed_api_testbed.c +++ b/src/testbed/testbed_api_testbed.c | |||
@@ -848,9 +848,9 @@ host_habitable_cb (void *cls, const struct GNUNET_TESTBED_Host *host, int status | |||
848 | rc->hc_handles[nhost] = NULL; | 848 | rc->hc_handles[nhost] = NULL; |
849 | if (GNUNET_NO == status) | 849 | if (GNUNET_NO == status) |
850 | { | 850 | { |
851 | if ((NULL != host) && (NULL != GNUNET_TESTBED_host_get_hostname_ (host))) | 851 | if ((NULL != host) && (NULL != GNUNET_TESTBED_host_get_hostname (host))) |
852 | LOG (GNUNET_ERROR_TYPE_ERROR, _("Host %s cannot start testbed\n"), | 852 | LOG (GNUNET_ERROR_TYPE_ERROR, _("Host %s cannot start testbed\n"), |
853 | GNUNET_TESTBED_host_get_hostname_ (host)); | 853 | GNUNET_TESTBED_host_get_hostname (host)); |
854 | else | 854 | else |
855 | LOG (GNUNET_ERROR_TYPE_ERROR, _("Testbed cannot be started on localhost\n")); | 855 | LOG (GNUNET_ERROR_TYPE_ERROR, _("Testbed cannot be started on localhost\n")); |
856 | GNUNET_SCHEDULER_cancel (rc->shutdown_run_task); | 856 | GNUNET_SCHEDULER_cancel (rc->shutdown_run_task); |
@@ -1013,8 +1013,7 @@ GNUNET_TESTBED_run (const char *host_filename, | |||
1013 | &host_habitable_cb, | 1013 | &host_habitable_cb, |
1014 | rc))) | 1014 | rc))) |
1015 | { | 1015 | { |
1016 | LOG (GNUNET_ERROR_TYPE_WARNING, "Host %s cannot start testbed\n", | 1016 | GNUNET_break (0); |
1017 | GNUNET_TESTBED_host_get_hostname_ (rc->hosts[nhost])); | ||
1018 | for (nhost = 0; nhost < rc->num_hosts; nhost++) | 1017 | for (nhost = 0; nhost < rc->num_hosts; nhost++) |
1019 | if (NULL != rc->hc_handles[nhost]) | 1018 | if (NULL != rc->hc_handles[nhost]) |
1020 | GNUNET_TESTBED_is_host_habitable_cancel (rc->hc_handles[nhost]); | 1019 | GNUNET_TESTBED_is_host_habitable_cancel (rc->hc_handles[nhost]); |