From 7f4ddbcab8598e3d5e29c23ce883cdfa664408f1 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 18 Jul 2020 00:44:39 +0200 Subject: merge flags into enum for GNUNET_DISK_pipe() API, fixing #6188 --- src/testbed/generate-underlay-topology.c | 12 ++++++------ src/testbed/gnunet-daemon-latency-logger.c | 4 ++-- src/testbed/gnunet-daemon-testbed-underlay.c | 4 ++-- src/testbed/gnunet-helper-testbed.c | 2 +- src/testbed/gnunet-service-testbed.h | 2 +- src/testbed/gnunet_testbed_mpi_spawn.c | 3 +-- src/testbed/test_testbed_api.c | 2 +- src/testbed/test_testbed_api_2peers_1controller.c | 2 +- src/testbed/test_testbed_api_controllerlink.c | 2 +- src/testbed/test_testbed_api_peer_reconfiguration.c | 2 +- src/testbed/test_testbed_api_peers_manage_services.c | 2 +- src/testbed/test_testbed_api_statistics.c | 2 +- src/testbed/test_testbed_api_test.c | 4 ++-- src/testbed/testbed_api_hosts.c | 2 +- 14 files changed, 22 insertions(+), 23 deletions(-) (limited to 'src/testbed') diff --git a/src/testbed/generate-underlay-topology.c b/src/testbed/generate-underlay-topology.c index 726bed179..97c3c1e67 100644 --- a/src/testbed/generate-underlay-topology.c +++ b/src/testbed/generate-underlay-topology.c @@ -51,12 +51,12 @@ __LINE__, \ sqlite3_errmsg (db)); \ if (msg != NULL) \ - GNUNET_asprintf (msg, \ - _ ("`%s' failed at %s:%u with error: %s"), \ - cmd, \ - __FILE__, \ - __LINE__, \ - sqlite3_errmsg (db)); \ + GNUNET_asprintf (msg, \ + _ ("`%s' failed at %s:%u with error: %s"), \ + cmd, \ + __FILE__, \ + __LINE__, \ + sqlite3_errmsg (db)); \ } while (0) diff --git a/src/testbed/gnunet-daemon-latency-logger.c b/src/testbed/gnunet-daemon-latency-logger.c index c13750db7..cbc9cfdbf 100644 --- a/src/testbed/gnunet-daemon-latency-logger.c +++ b/src/testbed/gnunet-daemon-latency-logger.c @@ -53,8 +53,8 @@ "`%s' failed at %s:%d with error: %s\n"), \ cmd, __FILE__, __LINE__, sqlite3_errmsg (db)); \ if (msg != NULL) \ - GNUNET_asprintf (msg, _ ("`%s' failed at %s:%u with error: %s"), cmd, \ - __FILE__, __LINE__, sqlite3_errmsg (db)); \ + GNUNET_asprintf (msg, _ ("`%s' failed at %s:%u with error: %s"), cmd, \ + __FILE__, __LINE__, sqlite3_errmsg (db)); \ } while (0) diff --git a/src/testbed/gnunet-daemon-testbed-underlay.c b/src/testbed/gnunet-daemon-testbed-underlay.c index 2bff7cdd4..c3b424c9b 100644 --- a/src/testbed/gnunet-daemon-testbed-underlay.c +++ b/src/testbed/gnunet-daemon-testbed-underlay.c @@ -57,8 +57,8 @@ "`%s' failed at %s:%d with error: %s\n"), \ cmd, __FILE__, __LINE__, sqlite3_errmsg (db)); \ if (msg != NULL) \ - GNUNET_asprintf (msg, _ ("`%s' failed at %s:%u with error: %s"), cmd, \ - __FILE__, __LINE__, sqlite3_errmsg (db)); \ + GNUNET_asprintf (msg, _ ("`%s' failed at %s:%u with error: %s"), cmd, \ + __FILE__, __LINE__, sqlite3_errmsg (db)); \ } while (0) diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c index 03be376fe..5d0c3b048 100644 --- a/src/testbed/gnunet-helper-testbed.c +++ b/src/testbed/gnunet-helper-testbed.c @@ -587,7 +587,7 @@ main (int argc, char **argv) status = GNUNET_OK; if (NULL == - (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO, GNUNET_NO))) + (sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE))) { GNUNET_break (0); return 1; diff --git a/src/testbed/gnunet-service-testbed.h b/src/testbed/gnunet-service-testbed.h index 03955327c..ae477ccb4 100644 --- a/src/testbed/gnunet-service-testbed.h +++ b/src/testbed/gnunet-service-testbed.h @@ -498,7 +498,7 @@ extern char *GST_stats_dir; GNUNET_assert (size <= accommodate_size); \ growth_size = size; \ while (growth_size <= accommodate_size) \ - growth_size += LIST_GROW_STEP; \ + growth_size += LIST_GROW_STEP; \ GNUNET_array_grow (ptr, size, growth_size); \ GNUNET_assert (size > accommodate_size); \ } while (0) diff --git a/src/testbed/gnunet_testbed_mpi_spawn.c b/src/testbed/gnunet_testbed_mpi_spawn.c index 353cc2881..577ffbeba 100644 --- a/src/testbed/gnunet_testbed_mpi_spawn.c +++ b/src/testbed/gnunet_testbed_mpi_spawn.c @@ -299,8 +299,7 @@ main (int argc, char *argv[]) GNUNET_break (0); return 1; } - if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, - GNUNET_NO, GNUNET_NO))) + if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE))) { GNUNET_break (0); ret = GNUNET_SYSERR; diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c index dd270df17..49f1d9ae9 100644 --- a/src/testbed/test_testbed_api.c +++ b/src/testbed/test_testbed_api.c @@ -163,7 +163,7 @@ do_shutdown (void *cls) if (! (cond)) { \ GNUNET_break (0); \ if (NULL != abort_task) \ - GNUNET_SCHEDULER_cancel (abort_task); \ + GNUNET_SCHEDULER_cancel (abort_task); \ abort_task = NULL; \ GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \ ret; \ diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c index c854d1ccc..4a8b8a584 100644 --- a/src/testbed/test_testbed_api_2peers_1controller.c +++ b/src/testbed/test_testbed_api_2peers_1controller.c @@ -173,7 +173,7 @@ static enum Stage result; if (! (cond)) { \ GNUNET_break (0); \ if (NULL != abort_task) \ - GNUNET_SCHEDULER_cancel (abort_task); \ + GNUNET_SCHEDULER_cancel (abort_task); \ abort_task = NULL; \ GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \ return; \ diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c index 16a3f7b91..784407520 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c @@ -298,7 +298,7 @@ static enum Stage result; { \ GNUNET_break (0); \ if (NULL != abort_task) \ - GNUNET_SCHEDULER_cancel (abort_task); \ + GNUNET_SCHEDULER_cancel (abort_task); \ abort_task = NULL; \ GNUNET_SCHEDULER_shutdown (); \ return; \ diff --git a/src/testbed/test_testbed_api_peer_reconfiguration.c b/src/testbed/test_testbed_api_peer_reconfiguration.c index 91955c13d..22dd46b53 100644 --- a/src/testbed/test_testbed_api_peer_reconfiguration.c +++ b/src/testbed/test_testbed_api_peer_reconfiguration.c @@ -77,7 +77,7 @@ enum if (! (cond)) { \ GNUNET_break (0); \ if (NULL != abort_task) \ - GNUNET_SCHEDULER_cancel (abort_task); \ + GNUNET_SCHEDULER_cancel (abort_task); \ abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ ret; \ } \ diff --git a/src/testbed/test_testbed_api_peers_manage_services.c b/src/testbed/test_testbed_api_peers_manage_services.c index 6d4f8196a..93b0da550 100644 --- a/src/testbed/test_testbed_api_peers_manage_services.c +++ b/src/testbed/test_testbed_api_peers_manage_services.c @@ -92,7 +92,7 @@ enum if (! (cond)) { \ GNUNET_break (0); \ if (NULL != abort_task) \ - GNUNET_SCHEDULER_cancel (abort_task); \ + GNUNET_SCHEDULER_cancel (abort_task); \ abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ ret; \ } \ diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c index dc305d008..4d42cda6a 100644 --- a/src/testbed/test_testbed_api_statistics.c +++ b/src/testbed/test_testbed_api_statistics.c @@ -76,7 +76,7 @@ static unsigned int num_seen_peers; if (! (cond)) { \ GNUNET_break (0); \ if (NULL != abort_task) \ - GNUNET_SCHEDULER_cancel (abort_task); \ + GNUNET_SCHEDULER_cancel (abort_task); \ abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ ret; \ } \ diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c index d3fec78d9..aefbd340e 100644 --- a/src/testbed/test_testbed_api_test.c +++ b/src/testbed/test_testbed_api_test.c @@ -90,10 +90,10 @@ do_shutdown (void *cls) if (! (cond)) { \ GNUNET_break (0); \ if (NULL != abort_task) \ - GNUNET_SCHEDULER_cancel (abort_task); \ + GNUNET_SCHEDULER_cancel (abort_task); \ abort_task = NULL; \ if (NULL == shutdown_task) \ - shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); \ + shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); \ return; \ } \ } while (0) diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 152762280..95a6bf76f 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c @@ -56,7 +56,7 @@ do \ { \ if (cond) \ - break; \ + break; \ LOG (GNUNET_ERROR_TYPE_ERROR, "API violation detected: %s\n", errstr); \ GNUNET_assert (0); \ } while (0) -- cgit v1.2.3