From c4e9ba925ffd758aaa3feee2ccfc0b76f26fe207 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 5 Oct 2019 15:09:28 +0200 Subject: global reindent, now with uncrustify hook enabled --- .../test_testbed_api_peer_reconfiguration.c | 114 +++++++++++---------- 1 file changed, 58 insertions(+), 56 deletions(-) (limited to 'src/testbed/test_testbed_api_peer_reconfiguration.c') diff --git a/src/testbed/test_testbed_api_peer_reconfiguration.c b/src/testbed/test_testbed_api_peer_reconfiguration.c index 40791a9cc..91955c13d 100644 --- a/src/testbed/test_testbed_api_peer_reconfiguration.c +++ b/src/testbed/test_testbed_api_peer_reconfiguration.c @@ -47,12 +47,13 @@ static struct GNUNET_TESTBED_Operation *op; /** * Abort task identifier */ -static struct GNUNET_SCHEDULER_Task * abort_task; +static struct GNUNET_SCHEDULER_Task *abort_task; /** * States in this test */ -enum { +enum +{ /** * Test has just been initialized */ @@ -73,14 +74,14 @@ enum { * Fail testcase */ #define FAIL_TEST(cond, ret) do { \ - if (!(cond)) { \ - GNUNET_break(0); \ - if (NULL != abort_task) \ - GNUNET_SCHEDULER_cancel (abort_task); \ - abort_task = GNUNET_SCHEDULER_add_now(&do_abort, NULL); \ - ret; \ - } \ - } while (0) + if (! (cond)) { \ + GNUNET_break (0); \ + if (NULL != abort_task) \ + GNUNET_SCHEDULER_cancel (abort_task); \ + abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ + ret; \ + } \ +} while (0) /** @@ -89,16 +90,16 @@ enum { * @param cls NULL */ static void -do_abort(void *cls) +do_abort (void *cls) { - GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Aborting\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting\n"); abort_task = NULL; if (NULL != op) - { - GNUNET_TESTBED_operation_done(op); - op = NULL; - } - GNUNET_SCHEDULER_shutdown(); + { + GNUNET_TESTBED_operation_done (op); + op = NULL; + } + GNUNET_SCHEDULER_shutdown (); } @@ -110,29 +111,29 @@ do_abort(void *cls) * @param event information about the event */ static void -controller_cb(void *cls, const struct GNUNET_TESTBED_EventInformation *event) +controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) { if (STATE_PEER_STARTED != state) return; if (GNUNET_TESTBED_ET_OPERATION_FINISHED != event->type) - { - GNUNET_TESTBED_operation_done(op); - op = NULL; - FAIL_TEST(0, return ); - } + { + GNUNET_TESTBED_operation_done (op); + op = NULL; + FAIL_TEST (0, return ); + } if (NULL != event->details.operation_finished.emsg) - { - fprintf(stderr, "Operation failed: %s\n", - event->details.operation_finished.emsg); - GNUNET_TESTBED_operation_done(op); - op = NULL; - FAIL_TEST(0, return ); - } - GNUNET_TESTBED_operation_done(op); + { + fprintf (stderr, "Operation failed: %s\n", + event->details.operation_finished.emsg); + GNUNET_TESTBED_operation_done (op); + op = NULL; + FAIL_TEST (0, return ); + } + GNUNET_TESTBED_operation_done (op); state = STATE_PEER_RECONFIGURED; - GNUNET_SCHEDULER_cancel(abort_task); + GNUNET_SCHEDULER_cancel (abort_task); abort_task = NULL; - GNUNET_SCHEDULER_shutdown(); + GNUNET_SCHEDULER_shutdown (); } @@ -149,27 +150,28 @@ controller_cb(void *cls, const struct GNUNET_TESTBED_EventInformation *event) * failed */ static void -test_master(void *cls, - struct GNUNET_TESTBED_RunHandle *h, - unsigned int num_peers, - struct GNUNET_TESTBED_Peer **peers_, - unsigned int links_succeeded, - unsigned int links_failed) +test_master (void *cls, + struct GNUNET_TESTBED_RunHandle *h, + unsigned int num_peers, + struct GNUNET_TESTBED_Peer **peers_, + unsigned int links_succeeded, + unsigned int links_failed) { struct GNUNET_CONFIGURATION_Handle *cfg; - FAIL_TEST(NUM_PEERS == num_peers, return ); + FAIL_TEST (NUM_PEERS == num_peers, return ); state = STATE_PEER_STARTED; peers = peers_; - cfg = GNUNET_CONFIGURATION_create(); - FAIL_TEST(GNUNET_OK == GNUNET_CONFIGURATION_load - (cfg, "test_testbed_api_testbed_run_topologyrandom.conf"), return ); - op = GNUNET_TESTBED_peer_update_configuration(peers[0], cfg); - GNUNET_CONFIGURATION_destroy(cfg); - FAIL_TEST(NULL != op, return ); - abort_task = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 30), - &do_abort, NULL); + cfg = GNUNET_CONFIGURATION_create (); + FAIL_TEST (GNUNET_OK == GNUNET_CONFIGURATION_load + (cfg, "test_testbed_api_testbed_run_topologyrandom.conf"), + return ); + op = GNUNET_TESTBED_peer_update_configuration (peers[0], cfg); + GNUNET_CONFIGURATION_destroy (cfg); + FAIL_TEST (NULL != op, return ); + abort_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply + (GNUNET_TIME_UNIT_SECONDS, 30), + &do_abort, NULL); } @@ -177,15 +179,15 @@ test_master(void *cls, * Main function */ int -main(int argc, char **argv) +main (int argc, char **argv) { state = STATE_INIT; - (void)GNUNET_TESTBED_test_run("test_testbed_api_peer_reconfiguration", - "test_testbed_api.conf", - NUM_PEERS, - 1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED, - &controller_cb, NULL, - &test_master, NULL); + (void) GNUNET_TESTBED_test_run ("test_testbed_api_peer_reconfiguration", + "test_testbed_api.conf", + NUM_PEERS, + 1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED, + &controller_cb, NULL, + &test_master, NULL); if (STATE_PEER_RECONFIGURED != state) return 1; return 0; -- cgit v1.2.3