aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/testbed/gnunet_testbed_mpi_spawn.c6
-rw-r--r--src/testbed/testbed_api_hosts.c3
2 files changed, 2 insertions, 7 deletions
diff --git a/src/testbed/gnunet_testbed_mpi_spawn.c b/src/testbed/gnunet_testbed_mpi_spawn.c
index 01cbd6576..736cd0cca 100644
--- a/src/testbed/gnunet_testbed_mpi_spawn.c
+++ b/src/testbed/gnunet_testbed_mpi_spawn.c
@@ -31,11 +31,6 @@ static struct GNUNET_OS_Process *child;
31static char **argv2; 31static char **argv2;
32 32
33/** 33/**
34 * All our IP addresses
35 */
36static char **our_addrs;
37
38/**
39 * Pipe used to communicate shutdown via signal. 34 * Pipe used to communicate shutdown via signal.
40 */ 35 */
41static struct GNUNET_DISK_PipeHandle *sigpipe; 36static struct GNUNET_DISK_PipeHandle *sigpipe;
@@ -196,7 +191,6 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
196{ 191{
197 struct GNUNET_TESTBED_Host **hosts; 192 struct GNUNET_TESTBED_Host **hosts;
198 const struct GNUNET_CONFIGURATION_Handle *null_cfg; 193 const struct GNUNET_CONFIGURATION_Handle *null_cfg;
199 const char *host_ip;
200 char *tmpdir; 194 char *tmpdir;
201 char *hostname; 195 char *hostname;
202 size_t hostname_len; 196 size_t hostname_len;
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index f93a140c5..0888a9032 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -689,7 +689,8 @@ GNUNET_TESTBED_hosts_load_from_loadleveler (const struct
689 return 0; 689 return 0;
690 if (NULL == hosts) 690 if (NULL == hosts)
691 goto cleanup; 691 goto cleanup;
692 qsort (hostnames, nhosts, sizeof (hostnames[0]), &strcmp); 692 qsort (hostnames, nhosts, sizeof (hostnames[0]),
693 (int (*)(const void *, const void *))&strcmp);
693 host_list = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Host *) * nhosts); 694 host_list = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Host *) * nhosts);
694 for (host = 0; host < nhosts; host++) 695 for (host = 0; host < nhosts; host++)
695 host_list[host] = GNUNET_TESTBED_host_create (hostnames[host], NULL, cfg, 0); 696 host_list[host] = GNUNET_TESTBED_host_create (hostnames[host], NULL, cfg, 0);