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/core/test_core_api_start_only.c | 223 ++++++++++++++++++------------------ 1 file changed, 112 insertions(+), 111 deletions(-) (limited to 'src/core/test_core_api_start_only.c') diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index c8a848359..f2eda4e7a 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c @@ -32,7 +32,8 @@ #define MTYPE 12345 -struct PeerContext { +struct PeerContext +{ struct GNUNET_CONFIGURATION_Handle *cfg; struct GNUNET_CORE_Handle *ch; struct GNUNET_PeerIdentity id; @@ -49,157 +50,157 @@ static int ok; static void * -connect_notify(void *cls, - const struct GNUNET_PeerIdentity *peer, - struct GNUNET_MQ_Handle *mq) +connect_notify (void *cls, + const struct GNUNET_PeerIdentity *peer, + struct GNUNET_MQ_Handle *mq) { return NULL; } static void -disconnect_notify(void *cls, - const struct GNUNET_PeerIdentity *peer, - void *internal_cls) +disconnect_notify (void *cls, + const struct GNUNET_PeerIdentity *peer, + void *internal_cls) { } static struct GNUNET_MQ_MessageHandler handlers[] = { - GNUNET_MQ_handler_end() + GNUNET_MQ_handler_end () }; static void -shutdown_task(void *cls) +shutdown_task (void *cls) { - GNUNET_CORE_disconnect(p1.ch); + GNUNET_CORE_disconnect (p1.ch); p1.ch = NULL; - GNUNET_CORE_disconnect(p2.ch); + GNUNET_CORE_disconnect (p2.ch); p2.ch = NULL; ok = 0; } static void -init_notify(void *cls, - const struct GNUNET_PeerIdentity *my_identity) +init_notify (void *cls, + const struct GNUNET_PeerIdentity *my_identity) { struct PeerContext *p = cls; if (p == &p1) - { - /* connect p2 */ - p2.ch = GNUNET_CORE_connect(p2.cfg, - &p2, - &init_notify, - &connect_notify, - &disconnect_notify, - handlers); - } + { + /* connect p2 */ + p2.ch = GNUNET_CORE_connect (p2.cfg, + &p2, + &init_notify, + &connect_notify, + &disconnect_notify, + handlers); + } else - { - GNUNET_assert(p == &p2); - GNUNET_SCHEDULER_cancel(timeout_task_id); - timeout_task_id = NULL; - GNUNET_SCHEDULER_add_now(&shutdown_task, - NULL); - } + { + GNUNET_assert (p == &p2); + GNUNET_SCHEDULER_cancel (timeout_task_id); + timeout_task_id = NULL; + GNUNET_SCHEDULER_add_now (&shutdown_task, + NULL); + } } static void -setup_peer(struct PeerContext *p, - const char *cfgname) +setup_peer (struct PeerContext *p, + const char *cfgname) { char *binary; - binary = GNUNET_OS_get_libexec_binary_path("gnunet-service-arm"); - p->cfg = GNUNET_CONFIGURATION_create(); + binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); + p->cfg = GNUNET_CONFIGURATION_create (); p->arm_proc = - GNUNET_OS_start_process(GNUNET_YES, - GNUNET_OS_INHERIT_STD_OUT_AND_ERR, - NULL, NULL, NULL, - binary, - "gnunet-service-arm", - "-c", cfgname, - NULL); - GNUNET_assert(GNUNET_OK == - GNUNET_CONFIGURATION_load(p->cfg, - cfgname)); - GNUNET_free(binary); + GNUNET_OS_start_process (GNUNET_YES, + GNUNET_OS_INHERIT_STD_OUT_AND_ERR, + NULL, NULL, NULL, + binary, + "gnunet-service-arm", + "-c", cfgname, + NULL); + GNUNET_assert (GNUNET_OK == + GNUNET_CONFIGURATION_load (p->cfg, + cfgname)); + GNUNET_free (binary); } static void -timeout_task(void *cls) +timeout_task (void *cls) { - fprintf(stderr, - "%s", - "Timeout.\n"); + fprintf (stderr, + "%s", + "Timeout.\n"); if (NULL != p1.ch) - { - GNUNET_CORE_disconnect(p1.ch); - p1.ch = NULL; - } + { + GNUNET_CORE_disconnect (p1.ch); + p1.ch = NULL; + } if (NULL != p2.ch) - { - GNUNET_CORE_disconnect(p2.ch); - p2.ch = NULL; - } + { + GNUNET_CORE_disconnect (p2.ch); + p2.ch = NULL; + } ok = 42; } static void -run(void *cls, - char *const *args, - const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *cfg) +run (void *cls, + char *const *args, + const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *cfg) { - GNUNET_assert(ok == 1); + GNUNET_assert (ok == 1); ok++; - setup_peer(&p1, "test_core_api_peer1.conf"); - setup_peer(&p2, "test_core_api_peer2.conf"); + setup_peer (&p1, "test_core_api_peer1.conf"); + setup_peer (&p2, "test_core_api_peer2.conf"); timeout_task_id = - GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_MINUTES, - TIMEOUT), - &timeout_task, - NULL); - p1.ch = GNUNET_CORE_connect(p1.cfg, - &p1, - &init_notify, - &connect_notify, - &disconnect_notify, - handlers); + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply + (GNUNET_TIME_UNIT_MINUTES, + TIMEOUT), + &timeout_task, + NULL); + p1.ch = GNUNET_CORE_connect (p1.cfg, + &p1, + &init_notify, + &connect_notify, + &disconnect_notify, + handlers); } static void -stop_arm(struct PeerContext *p) +stop_arm (struct PeerContext *p) { - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "Stopping peer\n"); - if (0 != GNUNET_OS_process_kill(p->arm_proc, - GNUNET_TERM_SIG)) - GNUNET_log_strerror(GNUNET_ERROR_TYPE_WARNING, - "kill"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Stopping peer\n"); + if (0 != GNUNET_OS_process_kill (p->arm_proc, + GNUNET_TERM_SIG)) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, + "kill"); if (GNUNET_OK != - GNUNET_OS_process_wait(p->arm_proc)) - GNUNET_log_strerror(GNUNET_ERROR_TYPE_WARNING, - "waitpid"); - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "ARM process %u stopped\n", - (unsigned int)GNUNET_OS_process_get_pid(p->arm_proc)); - GNUNET_OS_process_destroy(p->arm_proc); + GNUNET_OS_process_wait (p->arm_proc)) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, + "waitpid"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "ARM process %u stopped\n", + (unsigned int) GNUNET_OS_process_get_pid (p->arm_proc)); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; - GNUNET_CONFIGURATION_destroy(p->cfg); + GNUNET_CONFIGURATION_destroy (p->cfg); } static int -check() +check () { char *const argv[] = { "test-core-api-start-only", @@ -211,37 +212,37 @@ check() GNUNET_GETOPT_OPTION_END }; - GNUNET_DISK_directory_remove("/tmp/test-gnunet-core-peer-1"); - GNUNET_DISK_directory_remove("/tmp/test-gnunet-core-peer-2"); + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1"); + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2"); ok = 1; - GNUNET_PROGRAM_run((sizeof(argv) / sizeof(char *)) - 1, - argv, - "test-core-api-start-only", - "nohelp", - options, - &run, - &ok); - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "Test finished\n"); - stop_arm(&p1); - stop_arm(&p2); + GNUNET_PROGRAM_run ((sizeof(argv) / sizeof(char *)) - 1, + argv, + "test-core-api-start-only", + "nohelp", + options, + &run, + &ok); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Test finished\n"); + stop_arm (&p1); + stop_arm (&p2); return ok; } int -main(int argc, - char *argv[]) +main (int argc, + char *argv[]) { int ret; - GNUNET_log_setup("test-core-api-start-only", - "WARNING", - NULL); - ret = check(); - GNUNET_DISK_directory_remove("/tmp/test-gnunet-core-peer-1"); - GNUNET_DISK_directory_remove("/tmp/test-gnunet-core-peer-2"); + GNUNET_log_setup ("test-core-api-start-only", + "WARNING", + NULL); + ret = check (); + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1"); + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2"); return ret; } -- cgit v1.2.3