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/topology/test_gnunet_daemon_topology.c | |
parent | 6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff) | |
download | gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip |
indentation
Diffstat (limited to 'src/topology/test_gnunet_daemon_topology.c')
-rw-r--r-- | src/topology/test_gnunet_daemon_topology.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/topology/test_gnunet_daemon_topology.c index 9d0c055cb..c9a43ecd7 100644 --- a/src/topology/test_gnunet_daemon_topology.c +++ b/src/topology/test_gnunet_daemon_topology.c | |||
@@ -80,8 +80,7 @@ clean_up_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
80 | 80 | ||
81 | 81 | ||
82 | static void | 82 | static void |
83 | notify_connect_complete (void *cls, | 83 | notify_connect_complete (void *cls, const struct GNUNET_PeerIdentity *first, |
84 | const struct GNUNET_PeerIdentity *first, | ||
85 | const struct GNUNET_PeerIdentity *second, | 84 | const struct GNUNET_PeerIdentity *second, |
86 | unsigned int distance, | 85 | unsigned int distance, |
87 | const struct GNUNET_CONFIGURATION_Handle *first_cfg, | 86 | const struct GNUNET_CONFIGURATION_Handle *first_cfg, |
@@ -108,8 +107,7 @@ notify_connect_complete (void *cls, | |||
108 | 107 | ||
109 | 108 | ||
110 | static void | 109 | static void |
111 | my_cb (void *cls, | 110 | my_cb (void *cls, const struct GNUNET_PeerIdentity *id, |
112 | const struct GNUNET_PeerIdentity *id, | ||
113 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 111 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
114 | struct GNUNET_TESTING_Daemon *d, const char *emsg) | 112 | struct GNUNET_TESTING_Daemon *d, const char *emsg) |
115 | { | 113 | { |
@@ -134,22 +132,17 @@ my_cb (void *cls, | |||
134 | 132 | ||
135 | 133 | ||
136 | static void | 134 | static void |
137 | run (void *cls, | 135 | run (void *cls, char *const *args, const char *cfgfile, |
138 | char *const *args, | 136 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
139 | const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) | ||
140 | { | 137 | { |
141 | ok = 1; | 138 | ok = 1; |
142 | #if VERBOSE | 139 | #if VERBOSE |
143 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n"); | 140 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n"); |
144 | #endif | 141 | #endif |
145 | peers_left = NUM_PEERS; | 142 | peers_left = NUM_PEERS; |
146 | pg = GNUNET_TESTING_daemons_start (cfg, | 143 | pg = GNUNET_TESTING_daemons_start (cfg, peers_left, peers_left, peers_left, |
147 | peers_left, | 144 | TIMEOUT, NULL, NULL, &my_cb, NULL, NULL, |
148 | peers_left, | 145 | NULL, NULL); |
149 | peers_left, | ||
150 | TIMEOUT, | ||
151 | NULL, NULL, | ||
152 | &my_cb, NULL, NULL, NULL, NULL); | ||
153 | GNUNET_assert (pg != NULL); | 146 | GNUNET_assert (pg != NULL); |
154 | } | 147 | } |
155 | 148 | ||
@@ -169,9 +162,9 @@ check () | |||
169 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 162 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
170 | GNUNET_GETOPT_OPTION_END | 163 | GNUNET_GETOPT_OPTION_END |
171 | }; | 164 | }; |
172 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, | 165 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, |
173 | argv, "test-gnunet-daemon-topology", "nohelp", | 166 | "test-gnunet-daemon-topology", "nohelp", options, &run, |
174 | options, &run, &ok); | 167 | &ok); |
175 | return ok; | 168 | return ok; |
176 | } | 169 | } |
177 | 170 | ||