diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:54:06 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:54:06 +0000 |
commit | 5746309cb4be2073d550ad7a6885e918631dbc38 (patch) | |
tree | 89455bc4aadf977816b38df13f990372cd81d71a /src/testing/test_testing_group_remote.c | |
parent | 6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff) | |
download | gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip |
indentation
Diffstat (limited to 'src/testing/test_testing_group_remote.c')
-rw-r--r-- | src/testing/test_testing_group_remote.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/testing/test_testing_group_remote.c b/src/testing/test_testing_group_remote.c index d43e7ed57..e300f95e3 100644 --- a/src/testing/test_testing_group_remote.c +++ b/src/testing/test_testing_group_remote.c | |||
@@ -72,8 +72,7 @@ shutdown_callback (void *cls, const char *emsg) | |||
72 | 72 | ||
73 | 73 | ||
74 | static void | 74 | static void |
75 | my_cb (void *cls, | 75 | my_cb (void *cls, const struct GNUNET_PeerIdentity *id, |
76 | const struct GNUNET_PeerIdentity *id, | ||
77 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 76 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
78 | struct GNUNET_TESTING_Daemon *d, const char *emsg) | 77 | struct GNUNET_TESTING_Daemon *d, const char *emsg) |
79 | { | 78 | { |
@@ -98,9 +97,8 @@ my_cb (void *cls, | |||
98 | 97 | ||
99 | 98 | ||
100 | static void | 99 | static void |
101 | run (void *cls, | 100 | run (void *cls, char *const *args, const char *cfgfile, |
102 | char *const *args, | 101 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
103 | const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) | ||
104 | { | 102 | { |
105 | struct GNUNET_TESTING_Host *hosts; | 103 | struct GNUNET_TESTING_Host *hosts; |
106 | struct GNUNET_TESTING_Host *hostpos; | 104 | struct GNUNET_TESTING_Host *hostpos; |
@@ -133,8 +131,9 @@ run (void *cls, | |||
133 | if (hostfile != NULL) | 131 | if (hostfile != NULL) |
134 | { | 132 | { |
135 | if (GNUNET_OK != GNUNET_DISK_file_test (hostfile)) | 133 | if (GNUNET_OK != GNUNET_DISK_file_test (hostfile)) |
136 | GNUNET_DISK_fn_write (hostfile, NULL, 0, GNUNET_DISK_PERM_USER_READ | 134 | GNUNET_DISK_fn_write (hostfile, NULL, 0, |
137 | | GNUNET_DISK_PERM_USER_WRITE); | 135 | GNUNET_DISK_PERM_USER_READ | |
136 | GNUNET_DISK_PERM_USER_WRITE); | ||
138 | if ((0 != STAT (hostfile, &frstat)) || (frstat.st_size == 0)) | 137 | if ((0 != STAT (hostfile, &frstat)) || (frstat.st_size == 0)) |
139 | { | 138 | { |
140 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 139 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
@@ -202,9 +201,8 @@ run (void *cls, | |||
202 | pg = GNUNET_TESTING_daemons_start (cfg, peers_left, /* Total number of peers */ | 201 | pg = GNUNET_TESTING_daemons_start (cfg, peers_left, /* Total number of peers */ |
203 | peers_left, /* Number of outstanding connections */ | 202 | peers_left, /* Number of outstanding connections */ |
204 | peers_left, /* Number of parallel ssh connections, or peers being started at once */ | 203 | peers_left, /* Number of parallel ssh connections, or peers being started at once */ |
205 | TIMEOUT, | 204 | TIMEOUT, NULL, NULL, &my_cb, NULL, NULL, |
206 | NULL, | 205 | NULL, hosts); |
207 | NULL, &my_cb, NULL, NULL, NULL, hosts); | ||
208 | hostpos = hosts; | 206 | hostpos = hosts; |
209 | while (hostpos != NULL) | 207 | while (hostpos != NULL) |
210 | { | 208 | { |
@@ -233,8 +231,8 @@ check () | |||
233 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 231 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
234 | GNUNET_GETOPT_OPTION_END | 232 | GNUNET_GETOPT_OPTION_END |
235 | }; | 233 | }; |
236 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, | 234 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, |
237 | argv, "test-testing-group", "nohelp", options, &run, &ok); | 235 | "test-testing-group", "nohelp", options, &run, &ok); |
238 | return ok; | 236 | return ok; |
239 | } | 237 | } |
240 | 238 | ||