1 files changed, 27 insertions, 34 deletions
diff --git a/src/fs/fs_test_lib.h b/src/fs/fs_test_lib.h
index 2017b21ea..fa822e265 100644
--- a/src/fs/fs_test_lib.h
+++ b/src/fs/fs_test_lib.h
@@ -53,12 +53,11 @@ struct GNUNET_FS_TestDaemon;
 *             'GNUNET_FS_TEST_daemons_stop'!
 * @param cont_cls closure for cont
 */
-void
+void GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,
-GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,
+                                   struct GNUNET_TIME_Relative timeout,
-                              struct GNUNET_TIME_Relative timeout,
+                                   unsigned int total,
-                              unsigned int total,
+                                   struct GNUNET_FS_TestDaemon **daemons,
-                              struct GNUNET_FS_TestDaemon **daemons,
+                                   GNUNET_SCHEDULER_Task cont, void *cont_cls);
-                              GNUNET_SCHEDULER_Task cont, void *cont_cls);
 /**
@@ -71,11 +70,11 @@ GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,
 * @param cont function to call when done
 * @param cont_cls closure for cont
 */
-void
+void GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1,
-GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1,
+                                     struct GNUNET_FS_TestDaemon *daemon2,
-                                struct GNUNET_FS_TestDaemon *daemon2,
+                                     struct GNUNET_TIME_Relative timeout,
-                                struct GNUNET_TIME_Relative timeout,
+                                     GNUNET_SCHEDULER_Task cont,
-                                GNUNET_SCHEDULER_Task cont, void *cont_cls);
+                                     void *cont_cls);
 /**
@@ -107,9 +106,8 @@ const struct GNUNET_CONFIGURATION_Handle
 * @param total number of daemons to stop
 * @param daemons array with the daemons (values will be clobbered)
 */
-void
+void GNUNET_FS_TEST_daemons_stop (unsigned int total,
-GNUNET_FS_TEST_daemons_stop (unsigned int total,
+                                  struct GNUNET_FS_TestDaemon **daemons);
-                             struct GNUNET_FS_TestDaemon **daemons);
 /**
@@ -118,9 +116,9 @@ GNUNET_FS_TEST_daemons_stop (unsigned int total,
 * @param cls closure (user defined)
 * @param uri a URI, NULL for errors
 */
-typedef void
+typedef void (*GNUNET_FS_TEST_UriContinuation) (void *cls,
-    (*GNUNET_FS_TEST_UriContinuation) (void *cls,
+                                                const struct GNUNET_FS_Uri *
-                                       const struct GNUNET_FS_Uri * uri);
+                                                uri);
 /**
@@ -138,15 +136,12 @@ typedef void
 * @param cont function to call when done
 * @param cont_cls closure for cont
 */
-void
+void GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,
-GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,
+                             struct GNUNET_TIME_Relative timeout,
-                        struct GNUNET_TIME_Relative timeout,
+                             uint32_t anonymity, int do_index, uint64_t size,
-                        uint32_t anonymity,
+                             uint32_t seed, unsigned int verbose,
-                        int do_index,
+                             GNUNET_FS_TEST_UriContinuation cont,
-                        uint64_t size,
+                             void *cont_cls);
-                        uint32_t seed,
-                        unsigned int verbose,
-                        GNUNET_FS_TEST_UriContinuation cont, void *cont_cls);
 /**
@@ -162,14 +157,12 @@ GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,
 * @param cont function to call when done
 * @param cont_cls closure for cont
 */
-void
+void GNUNET_FS_TEST_download (struct GNUNET_FS_TestDaemon *daemon,
-GNUNET_FS_TEST_download (struct GNUNET_FS_TestDaemon *daemon,
+                              struct GNUNET_TIME_Relative timeout,
-                         struct GNUNET_TIME_Relative timeout,
+                              uint32_t anonymity, uint32_t seed,
-                         uint32_t anonymity,
+                              const struct GNUNET_FS_Uri *uri,
-                         uint32_t seed,
+                              unsigned int verbose, GNUNET_SCHEDULER_Task cont,
-                         const struct GNUNET_FS_Uri *uri,
+                              void *cont_cls);
-                         unsigned int verbose,
-                         GNUNET_SCHEDULER_Task cont, void *cont_cls);

diff --git a/src/fs/fs_test_lib.h b/src/fs/fs_test_lib.h index 2017b21ea..fa822e265 100644 --- a/src/fs/fs_test_lib.h +++ b/src/fs/fs_test_lib.h
@@ -53,12 +53,11 @@ struct GNUNET_FS_TestDaemon;
53	* 'GNUNET_FS_TEST_daemons_stop'!	53	* 'GNUNET_FS_TEST_daemons_stop'!
54	* @param cont_cls closure for cont	54	* @param cont_cls closure for cont
55	*/	55	*/
56	void	56	void GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,
57	GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,	57	struct GNUNET_TIME_Relative timeout,
58	struct GNUNET_TIME_Relative timeout,	58	unsigned int total,
59	unsigned int total,	59	struct GNUNET_FS_TestDaemon **daemons,
60	struct GNUNET_FS_TestDaemon **daemons,	60	GNUNET_SCHEDULER_Task cont, void *cont_cls);
61	GNUNET_SCHEDULER_Task cont, void *cont_cls);
62		61
63		62
64	/**	63	/**
@@ -71,11 +70,11 @@ GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,
71	* @param cont function to call when done	70	* @param cont function to call when done
72	* @param cont_cls closure for cont	71	* @param cont_cls closure for cont
73	*/	72	*/
74	void	73	void GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1,
75	GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1,	74	struct GNUNET_FS_TestDaemon *daemon2,
76	struct GNUNET_FS_TestDaemon *daemon2,	75	struct GNUNET_TIME_Relative timeout,
77	struct GNUNET_TIME_Relative timeout,	76	GNUNET_SCHEDULER_Task cont,
78	GNUNET_SCHEDULER_Task cont, void *cont_cls);	77	void *cont_cls);
79		78
80		79
81	/**	80	/**
@@ -107,9 +106,8 @@ const struct GNUNET_CONFIGURATION_Handle
107	* @param total number of daemons to stop	106	* @param total number of daemons to stop
108	* @param daemons array with the daemons (values will be clobbered)	107	* @param daemons array with the daemons (values will be clobbered)
109	*/	108	*/
110	void	109	void GNUNET_FS_TEST_daemons_stop (unsigned int total,
111	GNUNET_FS_TEST_daemons_stop (unsigned int total,	110	struct GNUNET_FS_TestDaemon **daemons);
112	struct GNUNET_FS_TestDaemon **daemons);
113		111
114		112
115	/**	113	/**
@@ -118,9 +116,9 @@ GNUNET_FS_TEST_daemons_stop (unsigned int total,
118	* @param cls closure (user defined)	116	* @param cls closure (user defined)
119	* @param uri a URI, NULL for errors	117	* @param uri a URI, NULL for errors
120	*/	118	*/
121	typedef void	119	typedef void (GNUNET_FS_TEST_UriContinuation) (void cls,
122	(GNUNET_FS_TEST_UriContinuation) (void cls,	120	const struct GNUNET_FS_Uri *
123	const struct GNUNET_FS_Uri * uri);	121	uri);
124		122
125		123
126	/**	124	/**
@@ -138,15 +136,12 @@ typedef void
138	* @param cont function to call when done	136	* @param cont function to call when done
139	* @param cont_cls closure for cont	137	* @param cont_cls closure for cont
140	*/	138	*/
141	void	139	void GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,
142	GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,	140	struct GNUNET_TIME_Relative timeout,
143	struct GNUNET_TIME_Relative timeout,	141	uint32_t anonymity, int do_index, uint64_t size,
144	uint32_t anonymity,	142	uint32_t seed, unsigned int verbose,
145	int do_index,	143	GNUNET_FS_TEST_UriContinuation cont,
146	uint64_t size,	144	void *cont_cls);
147	uint32_t seed,
148	unsigned int verbose,
149	GNUNET_FS_TEST_UriContinuation cont, void *cont_cls);
150		145
151		146
152	/**	147	/**
@@ -162,14 +157,12 @@ GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,
162	* @param cont function to call when done	157	* @param cont function to call when done
163	* @param cont_cls closure for cont	158	* @param cont_cls closure for cont
164	*/	159	*/
165	void	160	void GNUNET_FS_TEST_download (struct GNUNET_FS_TestDaemon *daemon,
166	GNUNET_FS_TEST_download (struct GNUNET_FS_TestDaemon *daemon,	161	struct GNUNET_TIME_Relative timeout,
167	struct GNUNET_TIME_Relative timeout,	162	uint32_t anonymity, uint32_t seed,
168	uint32_t anonymity,	163	const struct GNUNET_FS_Uri *uri,
169	uint32_t seed,	164	unsigned int verbose, GNUNET_SCHEDULER_Task cont,
170	const struct GNUNET_FS_Uri *uri,	165	void *cont_cls);
171	unsigned int verbose,
172	GNUNET_SCHEDULER_Task cont, void *cont_cls);
173		166
174		167
175		168