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 --- src/testbed/test_gnunet_helper_testbed.c | 112 +++++++++++++++---------------- 1 file changed, 56 insertions(+), 56 deletions(-) (limited to 'src/testbed/test_gnunet_helper_testbed.c') diff --git a/src/testbed/test_gnunet_helper_testbed.c b/src/testbed/test_gnunet_helper_testbed.c index 8bf1fd7ca..caf33c71b 100644 --- a/src/testbed/test_gnunet_helper_testbed.c +++ b/src/testbed/test_gnunet_helper_testbed.c @@ -37,7 +37,7 @@ * Generic logging shortcut */ #define LOG(kind, ...) \ - GNUNET_log(kind, __VA_ARGS__) + GNUNET_log (kind, __VA_ARGS__) /** @@ -58,12 +58,12 @@ static struct GNUNET_HELPER_SendHandle *shandle; /** * Abort task identifier */ -static struct GNUNET_SCHEDULER_Task * abort_task; +static struct GNUNET_SCHEDULER_Task *abort_task; /** * Shutdown task identifier */ -static struct GNUNET_SCHEDULER_Task * shutdown_task; +static struct GNUNET_SCHEDULER_Task *shutdown_task; /** * Configuratin handler @@ -82,15 +82,15 @@ static int result; * @param cls NULL */ static void -do_shutdown(void *cls) +do_shutdown (void *cls) { if (NULL != abort_task) - GNUNET_SCHEDULER_cancel(abort_task); + GNUNET_SCHEDULER_cancel (abort_task); if (NULL != helper) - GNUNET_HELPER_stop(helper, GNUNET_NO); - GNUNET_free_non_null(msg); + GNUNET_HELPER_stop (helper, GNUNET_NO); + GNUNET_free_non_null (msg); if (NULL != cfg) - GNUNET_CONFIGURATION_destroy(cfg); + GNUNET_CONFIGURATION_destroy (cfg); } @@ -100,15 +100,15 @@ do_shutdown(void *cls) * @param cls NULL */ static void -do_abort(void *cls) +do_abort (void *cls) { abort_task = NULL; - LOG(GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); + LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); result = GNUNET_SYSERR; if (NULL != shandle) - GNUNET_HELPER_send_cancel(shandle); + GNUNET_HELPER_send_cancel (shandle); if (NULL == shutdown_task) - shutdown_task = GNUNET_SCHEDULER_add_now(&do_shutdown, NULL); + shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); } @@ -121,13 +121,13 @@ do_abort(void *cls) * #GNUNET_SYSERR during GNUNET_HELPER_stop() */ static void -cont_cb(void *cls, - int result) +cont_cb (void *cls, + int result) { shandle = NULL; - LOG(GNUNET_ERROR_TYPE_DEBUG, - "Message sent\n"); - GNUNET_assert(GNUNET_OK == result); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Message sent\n"); + GNUNET_assert (GNUNET_OK == result); } @@ -143,35 +143,35 @@ cont_cb(void *cls, * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing */ static int -mst_cb(void *cls, - const struct GNUNET_MessageHeader *message) +mst_cb (void *cls, + const struct GNUNET_MessageHeader *message) { const struct GNUNET_TESTBED_HelperReply *msg; char *config; uLongf config_size; uLongf xconfig_size; - msg = (const struct GNUNET_TESTBED_HelperReply *)message; + msg = (const struct GNUNET_TESTBED_HelperReply *) message; config_size = 0; xconfig_size = 0; - GNUNET_assert(sizeof(struct GNUNET_TESTBED_HelperReply) < - ntohs(msg->header.size)); - GNUNET_assert(GNUNET_MESSAGE_TYPE_TESTBED_HELPER_REPLY == - ntohs(msg->header.type)); - config_size = (uLongf)ntohs(msg->config_size); + GNUNET_assert (sizeof(struct GNUNET_TESTBED_HelperReply) < + ntohs (msg->header.size)); + GNUNET_assert (GNUNET_MESSAGE_TYPE_TESTBED_HELPER_REPLY == + ntohs (msg->header.type)); + config_size = (uLongf) ntohs (msg->config_size); xconfig_size = - (uLongf)(ntohs(msg->header.size) - - sizeof(struct GNUNET_TESTBED_HelperReply)); - config = GNUNET_malloc(config_size); - GNUNET_assert(Z_OK == - uncompress((Bytef *)config, &config_size, - (const Bytef *)&msg[1], xconfig_size)); - GNUNET_free(config); + (uLongf) (ntohs (msg->header.size) + - sizeof(struct GNUNET_TESTBED_HelperReply)); + config = GNUNET_malloc (config_size); + GNUNET_assert (Z_OK == + uncompress ((Bytef *) config, &config_size, + (const Bytef *) &msg[1], xconfig_size)); + GNUNET_free (config); if (NULL == shutdown_task) shutdown_task = - GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 1), - &do_shutdown, NULL); + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply + (GNUNET_TIME_UNIT_SECONDS, 1), + &do_shutdown, NULL); return GNUNET_OK; } @@ -183,7 +183,7 @@ mst_cb(void *cls, * @param cls the closure from GNUNET_HELPER_start() */ static void -exp_cb(void *cls) +exp_cb (void *cls) { helper = NULL; result = GNUNET_SYSERR; @@ -199,8 +199,8 @@ exp_cb(void *cls) * @param cfg configuration */ static void -run(void *cls, char *const *args, const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *cfg2) +run (void *cls, char *const *args, const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *cfg2) { static char *const binary_argv[] = { "gnunet-helper-testbed", @@ -209,22 +209,22 @@ run(void *cls, char *const *args, const char *cfgfile, const char *trusted_ip = "127.0.0.1"; helper = - GNUNET_HELPER_start(GNUNET_YES, - "gnunet-helper-testbed", - binary_argv, - &mst_cb, - &exp_cb, - NULL); - GNUNET_assert(NULL != helper); - cfg = GNUNET_CONFIGURATION_dup(cfg2); - msg = GNUNET_TESTBED_create_helper_init_msg_(trusted_ip, NULL, cfg); + GNUNET_HELPER_start (GNUNET_YES, + "gnunet-helper-testbed", + binary_argv, + &mst_cb, + &exp_cb, + NULL); + GNUNET_assert (NULL != helper); + cfg = GNUNET_CONFIGURATION_dup (cfg2); + msg = GNUNET_TESTBED_create_helper_init_msg_ (trusted_ip, NULL, cfg); shandle = - GNUNET_HELPER_send(helper, &msg->header, GNUNET_NO, &cont_cb, NULL); - GNUNET_assert(NULL != shandle); + GNUNET_HELPER_send (helper, &msg->header, GNUNET_NO, &cont_cb, NULL); + GNUNET_assert (NULL != shandle); abort_task = - GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_MINUTES, 1), &do_abort, - NULL); + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply + (GNUNET_TIME_UNIT_MINUTES, 1), &do_abort, + NULL); } @@ -236,7 +236,7 @@ run(void *cls, char *const *args, const char *cfgfile, * @return return code */ int -main(int argc, char **argv) +main (int argc, char **argv) { struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_OPTION_END @@ -244,9 +244,9 @@ main(int argc, char **argv) result = GNUNET_OK; if (GNUNET_OK != - GNUNET_PROGRAM_run(argc, argv, "test_gnunet_helper_testbed", - "Testcase for testing gnunet-helper-testbed.c", - options, &run, NULL)) + GNUNET_PROGRAM_run (argc, argv, "test_gnunet_helper_testbed", + "Testcase for testing gnunet-helper-testbed.c", + options, &run, NULL)) return 1; return (GNUNET_OK == result) ? 0 : 1; } -- cgit v1.2.3