From 5746309cb4be2073d550ad7a6885e918631dbc38 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 15 Aug 2011 21:54:06 +0000 Subject: indentation --- src/fs/test_fs_list_indexed.c | 103 +++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 57 deletions(-) (limited to 'src/fs/test_fs_list_indexed.c') diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c index e3330f3ba..87afa12e1 100644 --- a/src/fs/test_fs_list_indexed.c +++ b/src/fs/test_fs_list_indexed.c @@ -92,8 +92,8 @@ static void list_indexed_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - GNUNET_SCHEDULER_add_continuation (&abort_publish_task, - NULL, GNUNET_SCHEDULER_REASON_PREREQ_DONE); + GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, + GNUNET_SCHEDULER_REASON_PREREQ_DONE); } @@ -110,11 +110,10 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) printf ("Publish complete, %llu kbps.\n", (unsigned long long) (FILESIZE * 1000 / (1 + - GNUNET_TIME_absolute_get_duration - (start).rel_value) / 1024)); + GNUNET_TIME_absolute_get_duration (start). + rel_value) / 1024)); if (0 == strcmp ("list_indexed-context-dir", event->value.publish.cctx)) - GNUNET_SCHEDULER_add_continuation (&list_indexed_task, - NULL, + GNUNET_SCHEDULER_add_continuation (&list_indexed_task, NULL, GNUNET_SCHEDULER_REASON_PREREQ_DONE); break; @@ -126,41 +125,41 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) (unsigned long long) event->value.publish.completed, (unsigned long long) event->value.publish.size, event->value.publish.specifics.progress.depth, - (unsigned long long) event->value.publish.specifics. - progress.offset); + (unsigned long long) event->value.publish.specifics.progress. + offset); #endif break; case GNUNET_FS_STATUS_PUBLISH_ERROR: ret = event->value.publish.cctx; - fprintf (stderr, - "Error publishing file: %s\n", + fprintf (stderr, "Error publishing file: %s\n", event->value.publish.specifics.error.message); err = 1; if (0 == strcmp ("list_indexed-context-dir", event->value.publish.cctx)) - GNUNET_SCHEDULER_add_continuation (&abort_publish_task, - NULL, + GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, GNUNET_SCHEDULER_REASON_PREREQ_DONE); break; case GNUNET_FS_STATUS_PUBLISH_START: ret = event->value.publish.cctx; if (0 == strcmp ("list_indexed-context1", event->value.publish.cctx)) { - GNUNET_assert (0 == strcmp ("list_indexed-context-dir", - event->value.publish.pctx)); + GNUNET_assert (0 == + strcmp ("list_indexed-context-dir", + event->value.publish.pctx)); GNUNET_assert (FILESIZE == event->value.publish.size); GNUNET_assert (0 == event->value.publish.completed); GNUNET_assert (1 == event->value.publish.anonymity); } else if (0 == strcmp ("list_indexed-context2", event->value.publish.cctx)) { - GNUNET_assert (0 == strcmp ("list_indexed-context-dir", - event->value.publish.pctx)); + GNUNET_assert (0 == + strcmp ("list_indexed-context-dir", + event->value.publish.pctx)); GNUNET_assert (FILESIZE == event->value.publish.size); GNUNET_assert (0 == event->value.publish.completed); GNUNET_assert (2 == event->value.publish.anonymity); } - else if (0 == strcmp ("list_indexed-context-dir", - event->value.publish.cctx)) + else if (0 == + strcmp ("list_indexed-context-dir", event->value.publish.cctx)) { GNUNET_assert (0 == event->value.publish.completed); GNUNET_assert (3 == event->value.publish.anonymity); @@ -188,12 +187,13 @@ setup_peer (struct PeerContext *p, const char *cfgname) { p->cfg = GNUNET_CONFIGURATION_create (); #if START_ARM - p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", - "gnunet-service-arm", + p->arm_proc = + GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", + "gnunet-service-arm", #if VERBOSE - "-L", "DEBUG", + "-L", "DEBUG", #endif - "-c", cfgname, NULL); + "-c", cfgname, NULL); #endif GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); } @@ -209,8 +209,7 @@ stop_arm (struct PeerContext *p) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "ARM process %u stopped\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); GNUNET_OS_process_close (p->arm_proc); p->arm_proc = NULL; @@ -221,9 +220,8 @@ stop_arm (struct PeerContext *p) 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) { const char *keywords[] = { "down_foo", @@ -239,19 +237,15 @@ run (void *cls, struct GNUNET_FS_BlockOptions bo; setup_peer (&p1, "test_fs_list_indexed_data.conf"); - fs = GNUNET_FS_start (cfg, - "test-fs-list_indexed", - &progress_cb, - NULL, GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); + fs = GNUNET_FS_start (cfg, "test-fs-list_indexed", &progress_cb, NULL, + GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); GNUNET_assert (NULL != fs); fn1 = GNUNET_DISK_mktemp ("gnunet-list_indexed-test-dst"); buf = GNUNET_malloc (FILESIZE); for (i = 0; i < FILESIZE; i++) buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256); GNUNET_assert (FILESIZE == - GNUNET_DISK_fn_write (fn1, - buf, - FILESIZE, + GNUNET_DISK_fn_write (fn1, buf, FILESIZE, GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE)); GNUNET_free (buf); @@ -261,9 +255,7 @@ run (void *cls, for (i = 0; i < FILESIZE; i++) buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256); GNUNET_assert (FILESIZE == - GNUNET_DISK_fn_write (fn2, - buf, - FILESIZE, + GNUNET_DISK_fn_write (fn2, buf, FILESIZE, GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE)); GNUNET_free (buf); @@ -274,33 +266,31 @@ run (void *cls, bo.anonymity_level = 1; bo.replication_level = 0; bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME); - fi1 = GNUNET_FS_file_information_create_from_file (fs, - "list_indexed-context1", - fn1, - kuri, - meta, GNUNET_YES, &bo); + fi1 = + GNUNET_FS_file_information_create_from_file (fs, "list_indexed-context1", + fn1, kuri, meta, GNUNET_YES, + &bo); GNUNET_assert (NULL != fi1); bo.anonymity_level = 2; - fi2 = GNUNET_FS_file_information_create_from_file (fs, - "list_indexed-context2", - fn2, - kuri, - meta, GNUNET_YES, &bo); + fi2 = + GNUNET_FS_file_information_create_from_file (fs, "list_indexed-context2", + fn2, kuri, meta, GNUNET_YES, + &bo); GNUNET_assert (NULL != fi2); bo.anonymity_level = 3; - fidir = GNUNET_FS_file_information_create_empty_directory (fs, - "list_indexed-context-dir", - kuri, meta, &bo); + fidir = + GNUNET_FS_file_information_create_empty_directory (fs, + "list_indexed-context-dir", + kuri, meta, &bo); GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi1)); GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi2)); GNUNET_FS_uri_destroy (kuri); GNUNET_CONTAINER_meta_data_destroy (meta); GNUNET_assert (NULL != fidir); start = GNUNET_TIME_absolute_get (); - publish = GNUNET_FS_publish_start (fs, - fidir, - NULL, NULL, NULL, - GNUNET_FS_PUBLISH_OPTION_NONE); + publish = + GNUNET_FS_publish_start (fs, fidir, NULL, NULL, NULL, + GNUNET_FS_PUBLISH_OPTION_NONE); GNUNET_assert (publish != NULL); } @@ -328,9 +318,8 @@ main (int argc, char *argv[]) "WARNING", #endif NULL); - GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, - argvx, "test-fs-list_indexed", - "nohelp", options, &run, NULL); + GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx, + "test-fs-list_indexed", "nohelp", options, &run, NULL); stop_arm (&p1); GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-list-indexed/"); if (fn1 != NULL) -- cgit v1.2.3