diff options
Diffstat (limited to 'src/fs/test_fs_download_recursive.c')
-rw-r--r-- | src/fs/test_fs_download_recursive.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/fs/test_fs_download_recursive.c b/src/fs/test_fs_download_recursive.c index c3e0ea440..d350dcae8 100644 --- a/src/fs/test_fs_download_recursive.c +++ b/src/fs/test_fs_download_recursive.c | |||
@@ -50,9 +50,9 @@ makeName (unsigned int i) | |||
50 | ("/tmp/gnunet-fsui-recursive_download_test/FSUITEST") + | 50 | ("/tmp/gnunet-fsui-recursive_download_test/FSUITEST") + |
51 | 15); | 51 | 15); |
52 | GNUNET_snprintf (fn, | 52 | GNUNET_snprintf (fn, |
53 | strlen | 53 | strlen ("/tmp/gnunet-fsui-recursive_download_test/FSUITEST") |
54 | ("/tmp/gnunet-fsui-recursive_download_test/FSUITEST") + 15, | 54 | + 15, "/tmp/gnunet-fsui-recursive_download_test/FSUITEST%u/", |
55 | "/tmp/gnunet-fsui-recursive_download_test/FSUITEST%u/", i); | 55 | i); |
56 | return fn; | 56 | return fn; |
57 | } | 57 | } |
58 | 58 | ||
@@ -142,8 +142,9 @@ checkHierarchy (unsigned int i, const char *tree) | |||
142 | GNUNET_free (fn); | 142 | GNUNET_free (fn); |
143 | return GNUNET_SYSERR; | 143 | return GNUNET_SYSERR; |
144 | } | 144 | } |
145 | res = ((makeHierarchyHelper (fn, tree, 0, 1) == -1) ? | 145 | res = |
146 | GNUNET_SYSERR : GNUNET_OK); | 146 | ((makeHierarchyHelper (fn, tree, 0, 1) == |
147 | -1) ? GNUNET_SYSERR : GNUNET_OK); | ||
147 | GNUNET_free (fn); | 148 | GNUNET_free (fn); |
148 | return res; | 149 | return res; |
149 | } | 150 | } |
@@ -287,9 +288,9 @@ main (int argc, char *argv[]) | |||
287 | GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS); /* give apps time to start */ | 288 | GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS); /* give apps time to start */ |
288 | /* ACTUAL TEST CODE */ | 289 | /* ACTUAL TEST CODE */ |
289 | #endif | 290 | #endif |
290 | ctx = GNUNET_FSUI_start (NULL, | 291 | ctx = |
291 | cfg, "fsuirecursive_download_test", 32, GNUNET_YES, | 292 | GNUNET_FSUI_start (NULL, cfg, "fsuirecursive_download_test", 32, |
292 | &eventCallback, NULL); | 293 | GNUNET_YES, &eventCallback, NULL); |
293 | CHECK (ctx != NULL); | 294 | CHECK (ctx != NULL); |
294 | fn = makeHierarchy (42, DIRECTORY_TREE_SPEC); | 295 | fn = makeHierarchy (42, DIRECTORY_TREE_SPEC); |
295 | meta = GNUNET_meta_data_create (); | 296 | meta = GNUNET_meta_data_create (); |
@@ -298,13 +299,13 @@ main (int argc, char *argv[]) | |||
298 | (const char **) keywords); | 299 | (const char **) keywords); |
299 | fprintf (stderr, "Uploading...\n"); | 300 | fprintf (stderr, "Uploading...\n"); |
300 | waitForEvent = GNUNET_FSUI_upload_completed; | 301 | waitForEvent = GNUNET_FSUI_upload_completed; |
301 | upload = GNUNET_FSUI_upload_start (ctx, | 302 | upload = |
302 | fn, | 303 | GNUNET_FSUI_upload_start (ctx, fn, |
303 | (GNUNET_FSUI_DirectoryScanCallback) & | 304 | (GNUNET_FSUI_DirectoryScanCallback) & |
304 | GNUNET_disk_directory_scan, NULL, 0, 0, | 305 | GNUNET_disk_directory_scan, NULL, 0, 0, |
305 | GNUNET_YES, GNUNET_NO, GNUNET_NO, | 306 | GNUNET_YES, GNUNET_NO, GNUNET_NO, |
306 | GNUNET_get_time () + | 307 | GNUNET_get_time () + 5 * GNUNET_CRON_HOURS, |
307 | 5 * GNUNET_CRON_HOURS, meta, kuri, kuri); | 308 | meta, kuri, kuri); |
308 | CHECK (upload != NULL); | 309 | CHECK (upload != NULL); |
309 | GNUNET_ECRS_uri_destroy (kuri); | 310 | GNUNET_ECRS_uri_destroy (kuri); |
310 | kuri = NULL; | 311 | kuri = NULL; |
@@ -324,10 +325,9 @@ main (int argc, char *argv[]) | |||
324 | fprintf (stderr, "Downloading...\n"); | 325 | fprintf (stderr, "Downloading...\n"); |
325 | waitForEvent = GNUNET_FSUI_download_completed; | 326 | waitForEvent = GNUNET_FSUI_download_completed; |
326 | fn43 = makeName (43); | 327 | fn43 = makeName (43); |
327 | download = GNUNET_FSUI_download_start (ctx, | 328 | download = |
328 | 0, | 329 | GNUNET_FSUI_download_start (ctx, 0, GNUNET_YES, upURI, meta, fn43, NULL, |
329 | GNUNET_YES, | 330 | NULL); |
330 | upURI, meta, fn43, NULL, NULL); | ||
331 | CHECK (download != NULL); | 331 | CHECK (download != NULL); |
332 | GNUNET_free (fn43); | 332 | GNUNET_free (fn43); |
333 | fn43 = NULL; | 333 | fn43 = NULL; |