diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-10-17 15:24:06 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-10-17 15:24:06 +0000 |
commit | fe044526251046515f8f9ea71b0e9cb7a9b89bc0 (patch) | |
tree | b5962a19b674bf65fbc7a4380e03c48598ccc7ae /src | |
parent | 0f6d24a229e9149db26a4e667ed25032d19f533a (diff) | |
download | gnunet-fe044526251046515f8f9ea71b0e9cb7a9b89bc0.tar.gz gnunet-fe044526251046515f8f9ea71b0e9cb7a9b89bc0.zip |
- use get_value_filename when retrieving filenames and paths
Diffstat (limited to 'src')
-rw-r--r-- | src/testbed/gnunet-daemon-testbed-blacklist.c | 6 | ||||
-rw-r--r-- | src/testbed/gnunet-helper-testbed.c | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_logger_api.c | 3 | ||||
-rw-r--r-- | src/testbed/testbed_api_hosts.c | 4 | ||||
-rw-r--r-- | src/testbed/testbed_api_testbed.c | 2 | ||||
-rw-r--r-- | src/testing/testing.c | 2 |
6 files changed, 9 insertions, 10 deletions
diff --git a/src/testbed/gnunet-daemon-testbed-blacklist.c b/src/testbed/gnunet-daemon-testbed-blacklist.c index 55cd35e10..95cdda8bd 100644 --- a/src/testbed/gnunet-daemon-testbed-blacklist.c +++ b/src/testbed/gnunet-daemon-testbed-blacklist.c | |||
@@ -214,9 +214,9 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
214 | char *shome; | 214 | char *shome; |
215 | char fname[PATH_MAX]; | 215 | char fname[PATH_MAX]; |
216 | 216 | ||
217 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (c, "PATHS", | 217 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (c, "PATHS", |
218 | "GNUNET_HOME", | 218 | "GNUNET_HOME", |
219 | &shome)) | 219 | &shome)) |
220 | { | 220 | { |
221 | GNUNET_break (0); | 221 | GNUNET_break (0); |
222 | return; | 222 | return; |
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c index 523f5f357..510b42dba 100644 --- a/src/testbed/gnunet-helper-testbed.c +++ b/src/testbed/gnunet-helper-testbed.c | |||
@@ -431,7 +431,7 @@ tokenizer_cb (void *cls, void *client, | |||
431 | GNUNET_assert (GNUNET_OK == | 431 | GNUNET_assert (GNUNET_OK == |
432 | GNUNET_TESTING_configuration_create (test_system, cfg)); | 432 | GNUNET_TESTING_configuration_create (test_system, cfg)); |
433 | GNUNET_assert (GNUNET_OK == | 433 | GNUNET_assert (GNUNET_OK == |
434 | GNUNET_CONFIGURATION_get_value_string (cfg, "PATHS", | 434 | GNUNET_CONFIGURATION_get_value_filename (cfg, "PATHS", |
435 | "DEFAULTCONFIG", | 435 | "DEFAULTCONFIG", |
436 | &config)); | 436 | &config)); |
437 | if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, config)) | 437 | if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, config)) |
diff --git a/src/testbed/test_testbed_logger_api.c b/src/testbed/test_testbed_logger_api.c index dae972427..11ba7270b 100644 --- a/src/testbed/test_testbed_logger_api.c +++ b/src/testbed/test_testbed_logger_api.c | |||
@@ -203,9 +203,8 @@ test_main (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
203 | struct GNUNET_TESTING_Peer *p) | 203 | struct GNUNET_TESTING_Peer *p) |
204 | { | 204 | { |
205 | FAIL_TEST (NULL != (h = GNUNET_TESTBED_LOGGER_connect (cfg)), return); | 205 | FAIL_TEST (NULL != (h = GNUNET_TESTBED_LOGGER_connect (cfg)), return); |
206 | FAIL_TEST (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string | 206 | FAIL_TEST (GNUNET_OK == GNUNET_CONFIGURATION_get_value_filename |
207 | (cfg, "testbed-logger", "dir", &search_dir), return); | 207 | (cfg, "testbed-logger", "dir", &search_dir), return); |
208 | search_dir = GNUNET_CONFIGURATION_expand_dollar (cfg, search_dir); | ||
209 | peer = p; | 208 | peer = p; |
210 | write_task = GNUNET_SCHEDULER_add_now (&do_write, NULL); | 209 | write_task = GNUNET_SCHEDULER_add_now (&do_write, NULL); |
211 | abort_task = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (10), | 210 | abort_task = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (10), |
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 2b0d20127..8af8e23d0 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c | |||
@@ -1102,7 +1102,7 @@ GNUNET_TESTBED_controller_start (const char *trusted_ip, | |||
1102 | GNUNET_asprintf (&port, "%u", host->port); | 1102 | GNUNET_asprintf (&port, "%u", host->port); |
1103 | LOG_DEBUG ("Starting remote connection to destination %s\n", hostname); | 1103 | LOG_DEBUG ("Starting remote connection to destination %s\n", hostname); |
1104 | if (GNUNET_OK != | 1104 | if (GNUNET_OK != |
1105 | GNUNET_CONFIGURATION_get_value_string (cfg, "testbed", | 1105 | GNUNET_CONFIGURATION_get_value_filename (cfg, "testbed", |
1106 | "HELPER_BINARY_PATH", | 1106 | "HELPER_BINARY_PATH", |
1107 | &helper_binary_path_args[0])) | 1107 | &helper_binary_path_args[0])) |
1108 | helper_binary_path_args[0] = | 1108 | helper_binary_path_args[0] = |
@@ -1330,7 +1330,7 @@ GNUNET_TESTBED_is_host_habitable (const struct GNUNET_TESTBED_Host *host, | |||
1330 | h->host = host; | 1330 | h->host = host; |
1331 | hostname = (NULL == host->hostname) ? "127.0.0.1" : host->hostname; | 1331 | hostname = (NULL == host->hostname) ? "127.0.0.1" : host->hostname; |
1332 | if (GNUNET_OK != | 1332 | if (GNUNET_OK != |
1333 | GNUNET_CONFIGURATION_get_value_string (config, "testbed", | 1333 | GNUNET_CONFIGURATION_get_value_filename (config, "testbed", |
1334 | "HELPER_BINARY_PATH", | 1334 | "HELPER_BINARY_PATH", |
1335 | &stat_args[1])) | 1335 | &stat_args[1])) |
1336 | stat_args[1] = | 1336 | stat_args[1] = |
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c index 17f50bad6..0bad02a7f 100644 --- a/src/testbed/testbed_api_testbed.c +++ b/src/testbed/testbed_api_testbed.c | |||
@@ -1326,7 +1326,7 @@ GNUNET_TESTBED_run (const char *host_filename, | |||
1326 | break; | 1326 | break; |
1327 | case GNUNET_TESTBED_TOPOLOGY_FROM_FILE: | 1327 | case GNUNET_TESTBED_TOPOLOGY_FROM_FILE: |
1328 | if (GNUNET_OK != | 1328 | if (GNUNET_OK != |
1329 | GNUNET_CONFIGURATION_get_value_string (rc->cfg, TESTBED_CONFIG_SECTION, | 1329 | GNUNET_CONFIGURATION_get_value_filename (rc->cfg, TESTBED_CONFIG_SECTION, |
1330 | "OVERLAY_TOPOLOGY_FILE", | 1330 | "OVERLAY_TOPOLOGY_FILE", |
1331 | &rc->topo_file)) | 1331 | &rc->topo_file)) |
1332 | { | 1332 | { |
diff --git a/src/testing/testing.c b/src/testing/testing.c index 629089f87..c21f523ea 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -1227,7 +1227,7 @@ GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system, | |||
1227 | goto err_ret; | 1227 | goto err_ret; |
1228 | } | 1228 | } |
1229 | GNUNET_assert (GNUNET_OK == | 1229 | GNUNET_assert (GNUNET_OK == |
1230 | GNUNET_CONFIGURATION_get_value_string | 1230 | GNUNET_CONFIGURATION_get_value_filename |
1231 | (cfg, "PATHS", "DEFAULTCONFIG", &config_filename)); | 1231 | (cfg, "PATHS", "DEFAULTCONFIG", &config_filename)); |
1232 | if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, config_filename)) | 1232 | if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, config_filename)) |
1233 | { | 1233 | { |