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/mesh/test_mesh_api.c | |
parent | 6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff) | |
download | gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip |
indentation
Diffstat (limited to 'src/mesh/test_mesh_api.c')
-rw-r--r-- | src/mesh/test_mesh_api.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/mesh/test_mesh_api.c b/src/mesh/test_mesh_api.c index 9828ee8d9..c5f0e9f0f 100644 --- a/src/mesh/test_mesh_api.c +++ b/src/mesh/test_mesh_api.c | |||
@@ -51,9 +51,7 @@ GNUNET_SCHEDULER_TaskIdentifier test_task; | |||
51 | * GNUNET_SYSERR to close it (signal serious error) | 51 | * GNUNET_SYSERR to close it (signal serious error) |
52 | */ | 52 | */ |
53 | static int | 53 | static int |
54 | callback (void *cls, | 54 | callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx, |
55 | struct GNUNET_MESH_Tunnel *tunnel, | ||
56 | void **tunnel_ctx, | ||
57 | const struct GNUNET_PeerIdentity *sender, | 55 | const struct GNUNET_PeerIdentity *sender, |
58 | const struct GNUNET_MessageHeader *message, | 56 | const struct GNUNET_MessageHeader *message, |
59 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) | 57 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) |
@@ -125,16 +123,16 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
125 | 123 | ||
126 | 124 | ||
127 | static void | 125 | static void |
128 | run (void *cls, | 126 | run (void *cls, char *const *args, const char *cfgfile, |
129 | char *const *args, | 127 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
130 | const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) | ||
131 | { | 128 | { |
132 | arm_pid = GNUNET_OS_start_process (NULL, NULL, | 129 | arm_pid = |
133 | "gnunet-service-arm", "gnunet-service-arm", | 130 | GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", |
131 | "gnunet-service-arm", | ||
134 | #if VERBOSE_ARM | 132 | #if VERBOSE_ARM |
135 | "-L", "DEBUG", | 133 | "-L", "DEBUG", |
136 | #endif | 134 | #endif |
137 | "-c", "test_mesh.conf", NULL); | 135 | "-c", "test_mesh.conf", NULL); |
138 | 136 | ||
139 | abort_task = | 137 | abort_task = |
140 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 138 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
@@ -170,14 +168,14 @@ main (int argc, char *argv[]) | |||
170 | "WARNING", | 168 | "WARNING", |
171 | #endif | 169 | #endif |
172 | NULL); | 170 | NULL); |
173 | ret = GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, | 171 | ret = |
174 | argv2, "test-mesh-api", "nohelp", | 172 | GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, |
175 | options, &run, NULL); | 173 | "test-mesh-api", "nohelp", options, &run, NULL); |
176 | 174 | ||
177 | if (GNUNET_OK != ret) | 175 | if (GNUNET_OK != ret) |
178 | { | 176 | { |
179 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 177 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "run failed with error code %d\n", |
180 | "run failed with error code %d\n", ret); | 178 | ret); |
181 | return 1; | 179 | return 1; |
182 | } | 180 | } |
183 | if (GNUNET_SYSERR == result) | 181 | if (GNUNET_SYSERR == result) |