1 files changed, 31 insertions, 30 deletions
diff --git a/src/fs/fs_test_lib.h b/src/fs/fs_test_lib.h
index fa822e265..ad1d96bf0 100644
--- a/src/fs/fs_test_lib.h
+++ b/src/fs/fs_test_lib.h
@@ -53,11 +53,12 @@ struct GNUNET_FS_TestDaemon;
 *             'GNUNET_FS_TEST_daemons_stop'!
 * @param cont_cls closure for cont
 */
-void GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,
+void
-                                   struct GNUNET_TIME_Relative timeout,
+GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,
-                                   unsigned int total,
+                              struct GNUNET_TIME_Relative timeout,
-                                   struct GNUNET_FS_TestDaemon **daemons,
+                              unsigned int total,
-                                   GNUNET_SCHEDULER_Task cont, void *cont_cls);
+                              struct GNUNET_FS_TestDaemon **daemons,
+                              GNUNET_SCHEDULER_Task cont, void *cont_cls);
 /**
@@ -70,11 +71,11 @@ void GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,
 * @param cont function to call when done
 * @param cont_cls closure for cont
 */
-void GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1,
+void
-                                     struct GNUNET_FS_TestDaemon *daemon2,
+GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1,
-                                     struct GNUNET_TIME_Relative timeout,
+                                struct GNUNET_FS_TestDaemon *daemon2,
-                                     GNUNET_SCHEDULER_Task cont,
+                                struct GNUNET_TIME_Relative timeout,
-                                     void *cont_cls);
+                                GNUNET_SCHEDULER_Task cont, void *cont_cls);
 /**
@@ -83,9 +84,8 @@ void GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1,
 * @param daemons array with the daemons (must contain at least one)
 * @return peer group
 */
-struct GNUNET_TESTING_PeerGroup *GNUNET_FS_TEST_get_group (struct
+struct GNUNET_TESTING_PeerGroup *
-                                                           GNUNET_FS_TestDaemon
+GNUNET_FS_TEST_get_group (struct GNUNET_FS_TestDaemon **daemons);
-                                                           **daemons);
@@ -96,9 +96,9 @@ struct GNUNET_TESTING_PeerGroup *GNUNET_FS_TEST_get_group (struct
 * @param off which configuration to get
 * @return peer configuration
 */
-const struct GNUNET_CONFIGURATION_Handle
+const struct GNUNET_CONFIGURATION_Handle *
-    *GNUNET_FS_TEST_get_configuration (struct GNUNET_FS_TestDaemon **daemons,
+GNUNET_FS_TEST_get_configuration (struct GNUNET_FS_TestDaemon **daemons,
-                                       unsigned int off);
+                                  unsigned int off);
 /**
 * Stop daemons used for testing.
@@ -106,8 +106,9 @@ const struct GNUNET_CONFIGURATION_Handle
 * @param total number of daemons to stop
 * @param daemons array with the daemons (values will be clobbered)
 */
-void GNUNET_FS_TEST_daemons_stop (unsigned int total,
+void
-                                  struct GNUNET_FS_TestDaemon **daemons);
+GNUNET_FS_TEST_daemons_stop (unsigned int total,
+                             struct GNUNET_FS_TestDaemon **daemons);
 /**
@@ -136,12 +137,12 @@ typedef void (*GNUNET_FS_TEST_UriContinuation) (void *cls,
 * @param cont function to call when done
 * @param cont_cls closure for cont
 */
-void GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,
+void
-                             struct GNUNET_TIME_Relative timeout,
+GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,
-                             uint32_t anonymity, int do_index, uint64_t size,
+                        struct GNUNET_TIME_Relative timeout, uint32_t anonymity,
-                             uint32_t seed, unsigned int verbose,
+                        int do_index, uint64_t size, uint32_t seed,
-                             GNUNET_FS_TEST_UriContinuation cont,
+                        unsigned int verbose,
-                             void *cont_cls);
+                        GNUNET_FS_TEST_UriContinuation cont, void *cont_cls);
 /**
@@ -157,12 +158,12 @@ void GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,
 * @param cont function to call when done
 * @param cont_cls closure for cont
 */
-void GNUNET_FS_TEST_download (struct GNUNET_FS_TestDaemon *daemon,
+void
-                              struct GNUNET_TIME_Relative timeout,
+GNUNET_FS_TEST_download (struct GNUNET_FS_TestDaemon *daemon,
-                              uint32_t anonymity, uint32_t seed,
+                         struct GNUNET_TIME_Relative timeout,
-                              const struct GNUNET_FS_Uri *uri,
+                         uint32_t anonymity, uint32_t seed,
-                              unsigned int verbose, GNUNET_SCHEDULER_Task cont,
+                         const struct GNUNET_FS_Uri *uri, unsigned int verbose,
-                              void *cont_cls);
+                         GNUNET_SCHEDULER_Task cont, void *cont_cls);

diff --git a/src/fs/fs_test_lib.h b/src/fs/fs_test_lib.h index fa822e265..ad1d96bf0 100644 --- a/src/fs/fs_test_lib.h +++ b/src/fs/fs_test_lib.h
@@ -53,11 +53,12 @@ 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 GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,	56	void
57	struct GNUNET_TIME_Relative timeout,	57	GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,
58	unsigned int total,	58	struct GNUNET_TIME_Relative timeout,
59	struct GNUNET_FS_TestDaemon **daemons,	59	unsigned int total,
60	GNUNET_SCHEDULER_Task cont, void *cont_cls);	60	struct GNUNET_FS_TestDaemon **daemons,
		61	GNUNET_SCHEDULER_Task cont, void *cont_cls);
61		62
62		63
63	/**	64	/**
@@ -70,11 +71,11 @@ void GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,
70	* @param cont function to call when done	71	* @param cont function to call when done
71	* @param cont_cls closure for cont	72	* @param cont_cls closure for cont
72	*/	73	*/
73	void GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1,	74	void
74	struct GNUNET_FS_TestDaemon *daemon2,	75	GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1,
75	struct GNUNET_TIME_Relative timeout,	76	struct GNUNET_FS_TestDaemon *daemon2,
76	GNUNET_SCHEDULER_Task cont,	77	struct GNUNET_TIME_Relative timeout,
77	void *cont_cls);	78	GNUNET_SCHEDULER_Task cont, void *cont_cls);
78		79
79		80
80	/**	81	/**
@@ -83,9 +84,8 @@ void GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1,
83	* @param daemons array with the daemons (must contain at least one)	84	* @param daemons array with the daemons (must contain at least one)
84	* @return peer group	85	* @return peer group
85	*/	86	*/
86	struct GNUNET_TESTING_PeerGroup *GNUNET_FS_TEST_get_group (struct	87	struct GNUNET_TESTING_PeerGroup *
87	GNUNET_FS_TestDaemon	88	GNUNET_FS_TEST_get_group (struct GNUNET_FS_TestDaemon **daemons);
88	**daemons);
89		89
90		90
91		91
@@ -96,9 +96,9 @@ struct GNUNET_TESTING_PeerGroup *GNUNET_FS_TEST_get_group (struct
96	* @param off which configuration to get	96	* @param off which configuration to get
97	* @return peer configuration	97	* @return peer configuration
98	*/	98	*/
99	const struct GNUNET_CONFIGURATION_Handle	99	const struct GNUNET_CONFIGURATION_Handle *
100	GNUNET_FS_TEST_get_configuration (struct GNUNET_FS_TestDaemon *daemons,	100	GNUNET_FS_TEST_get_configuration (struct GNUNET_FS_TestDaemon **daemons,
101	unsigned int off);	101	unsigned int off);
102		102
103	/**	103	/**
104	* Stop daemons used for testing.	104	* Stop daemons used for testing.
@@ -106,8 +106,9 @@ const struct GNUNET_CONFIGURATION_Handle
106	* @param total number of daemons to stop	106	* @param total number of daemons to stop
107	* @param daemons array with the daemons (values will be clobbered)	107	* @param daemons array with the daemons (values will be clobbered)
108	*/	108	*/
109	void GNUNET_FS_TEST_daemons_stop (unsigned int total,	109	void
110	struct GNUNET_FS_TestDaemon **daemons);	110	GNUNET_FS_TEST_daemons_stop (unsigned int total,
		111	struct GNUNET_FS_TestDaemon **daemons);
111		112
112		113
113	/**	114	/**
@@ -136,12 +137,12 @@ typedef void (GNUNET_FS_TEST_UriContinuation) (void cls,
136	* @param cont function to call when done	137	* @param cont function to call when done
137	* @param cont_cls closure for cont	138	* @param cont_cls closure for cont
138	*/	139	*/
139	void GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,	140	void
140	struct GNUNET_TIME_Relative timeout,	141	GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,
141	uint32_t anonymity, int do_index, uint64_t size,	142	struct GNUNET_TIME_Relative timeout, uint32_t anonymity,
142	uint32_t seed, unsigned int verbose,	143	int do_index, uint64_t size, uint32_t seed,
143	GNUNET_FS_TEST_UriContinuation cont,	144	unsigned int verbose,
144	void *cont_cls);	145	GNUNET_FS_TEST_UriContinuation cont, void *cont_cls);
145		146
146		147
147	/**	148	/**
@@ -157,12 +158,12 @@ void GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,
157	* @param cont function to call when done	158	* @param cont function to call when done
158	* @param cont_cls closure for cont	159	* @param cont_cls closure for cont
159	*/	160	*/
160	void GNUNET_FS_TEST_download (struct GNUNET_FS_TestDaemon *daemon,	161	void
161	struct GNUNET_TIME_Relative timeout,	162	GNUNET_FS_TEST_download (struct GNUNET_FS_TestDaemon *daemon,
162	uint32_t anonymity, uint32_t seed,	163	struct GNUNET_TIME_Relative timeout,
163	const struct GNUNET_FS_Uri *uri,	164	uint32_t anonymity, uint32_t seed,
164	unsigned int verbose, GNUNET_SCHEDULER_Task cont,	165	const struct GNUNET_FS_Uri *uri, unsigned int verbose,
165	void *cont_cls);	166	GNUNET_SCHEDULER_Task cont, void *cont_cls);
166		167
167		168
168		169