aboutsummaryrefslogtreecommitdiff
path: root/src/fs/fs_download.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-07-03 11:07:50 +0000
committerChristian Grothoff <christian@grothoff.org>2016-07-03 11:07:50 +0000
commit8b46e74546fb643a5d272bb1edd8c909a4ee978d (patch)
treed26ec1e7d4a346dc7f41e297a7180a376acacb5c /src/fs/fs_download.c
parentb8eebba5dd3716f4d585e0b6b85d6ba36ef0241e (diff)
downloadgnunet-8b46e74546fb643a5d272bb1edd8c909a4ee978d.tar.gz
gnunet-8b46e74546fb643a5d272bb1edd8c909a4ee978d.zip
-just indenting fixes
Diffstat (limited to 'src/fs/fs_download.c')
-rw-r--r--src/fs/fs_download.c82
1 files changed, 57 insertions, 25 deletions
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index 42677af8a..d89d70719 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -2171,15 +2171,27 @@ struct GNUNET_FS_DownloadContext *
2171GNUNET_FS_download_start (struct GNUNET_FS_Handle *h, 2171GNUNET_FS_download_start (struct GNUNET_FS_Handle *h,
2172 const struct GNUNET_FS_Uri *uri, 2172 const struct GNUNET_FS_Uri *uri,
2173 const struct GNUNET_CONTAINER_MetaData *meta, 2173 const struct GNUNET_CONTAINER_MetaData *meta,
2174 const char *filename, const char *tempname, 2174 const char *filename,
2175 uint64_t offset, uint64_t length, uint32_t anonymity, 2175 const char *tempname,
2176 enum GNUNET_FS_DownloadOptions options, void *cctx, 2176 uint64_t offset,
2177 uint64_t length,
2178 uint32_t anonymity,
2179 enum GNUNET_FS_DownloadOptions options,
2180 void *cctx,
2177 struct GNUNET_FS_DownloadContext *parent) 2181 struct GNUNET_FS_DownloadContext *parent)
2178{ 2182{
2179 struct GNUNET_FS_DownloadContext *dc; 2183 struct GNUNET_FS_DownloadContext *dc;
2180 2184
2181 dc = create_download_context (h, uri, meta, filename, tempname, 2185 dc = create_download_context (h,
2182 offset, length, anonymity, options, cctx); 2186 uri,
2187 meta,
2188 filename,
2189 tempname,
2190 offset,
2191 length,
2192 anonymity,
2193 options,
2194 cctx);
2183 if (NULL == dc) 2195 if (NULL == dc)
2184 return NULL; 2196 return NULL;
2185 dc->parent = parent; 2197 dc->parent = parent;
@@ -2230,8 +2242,10 @@ struct GNUNET_FS_DownloadContext *
2230GNUNET_FS_download_start_from_search (struct GNUNET_FS_Handle *h, 2242GNUNET_FS_download_start_from_search (struct GNUNET_FS_Handle *h,
2231 struct GNUNET_FS_SearchResult *sr, 2243 struct GNUNET_FS_SearchResult *sr,
2232 const char *filename, 2244 const char *filename,
2233 const char *tempname, uint64_t offset, 2245 const char *tempname,
2234 uint64_t length, uint32_t anonymity, 2246 uint64_t offset,
2247 uint64_t length,
2248 uint32_t anonymity,
2235 enum GNUNET_FS_DownloadOptions options, 2249 enum GNUNET_FS_DownloadOptions options,
2236 void *cctx) 2250 void *cctx)
2237{ 2251{
@@ -2242,8 +2256,16 @@ GNUNET_FS_download_start_from_search (struct GNUNET_FS_Handle *h,
2242 GNUNET_break (0); 2256 GNUNET_break (0);
2243 return NULL; 2257 return NULL;
2244 } 2258 }
2245 dc = create_download_context (h, sr->uri, sr->meta, filename, tempname, 2259 dc = create_download_context (h,
2246 offset, length, anonymity, options, cctx); 2260 sr->uri,
2261 sr->meta,
2262 filename,
2263 tempname,
2264 offset,
2265 length,
2266 anonymity,
2267 options,
2268 cctx);
2247 if (NULL == dc) 2269 if (NULL == dc)
2248 return NULL; 2270 return NULL;
2249 dc->search = sr; 2271 dc->search = sr;
@@ -2271,8 +2293,11 @@ GNUNET_FS_download_start_downloading_ (struct GNUNET_FS_DownloadContext *dc)
2271 GNUNET_assert (NULL == dc->job_queue); 2293 GNUNET_assert (NULL == dc->job_queue);
2272 GNUNET_assert (NULL != dc->active); 2294 GNUNET_assert (NULL != dc->active);
2273 dc->job_queue = 2295 dc->job_queue =
2274 GNUNET_FS_queue_ (dc->h, &activate_fs_download, &deactivate_fs_download, 2296 GNUNET_FS_queue_ (dc->h,
2275 dc, (dc->length + DBLOCK_SIZE - 1) / DBLOCK_SIZE, 2297 &activate_fs_download,
2298 &deactivate_fs_download,
2299 dc,
2300 (dc->length + DBLOCK_SIZE - 1) / DBLOCK_SIZE,
2276 (0 == (dc->options & GNUNET_FS_DOWNLOAD_IS_PROBE)) 2301 (0 == (dc->options & GNUNET_FS_DOWNLOAD_IS_PROBE))
2277 ? GNUNET_FS_QUEUE_PRIORITY_NORMAL 2302 ? GNUNET_FS_QUEUE_PRIORITY_NORMAL
2278 : GNUNET_FS_QUEUE_PRIORITY_PROBE); 2303 : GNUNET_FS_QUEUE_PRIORITY_PROBE);
@@ -2290,9 +2315,10 @@ GNUNET_FS_download_start_downloading_ (struct GNUNET_FS_DownloadContext *dc)
2290void 2315void
2291GNUNET_FS_download_suspend (struct GNUNET_FS_DownloadContext *dc) 2316GNUNET_FS_download_suspend (struct GNUNET_FS_DownloadContext *dc)
2292{ 2317{
2293 deactivate_fs_download(dc); 2318 deactivate_fs_download(dc);
2294} 2319}
2295 2320
2321
2296/** 2322/**
2297 * Resume a suspended download. 2323 * Resume a suspended download.
2298 * 2324 *
@@ -2301,17 +2327,19 @@ GNUNET_FS_download_suspend (struct GNUNET_FS_DownloadContext *dc)
2301void 2327void
2302GNUNET_FS_download_resume (struct GNUNET_FS_DownloadContext *dc) 2328GNUNET_FS_download_resume (struct GNUNET_FS_DownloadContext *dc)
2303{ 2329{
2304 struct GNUNET_FS_ProgressInfo pi; 2330 struct GNUNET_FS_ProgressInfo pi;
2305 2331
2306 pi.status = GNUNET_FS_STATUS_DOWNLOAD_ACTIVE; 2332 pi.status = GNUNET_FS_STATUS_DOWNLOAD_ACTIVE;
2307 GNUNET_FS_download_make_status_ (&pi, dc); 2333 GNUNET_FS_download_make_status_ (&pi, dc);
2308 2334
2309 dc->job_queue = 2335 dc->job_queue =
2310 GNUNET_FS_queue_ (dc->h, &activate_fs_download, &deactivate_fs_download, 2336 GNUNET_FS_queue_ (dc->h,
2311 dc, (dc->length + DBLOCK_SIZE - 1) / DBLOCK_SIZE, 2337 &activate_fs_download,
2312 (0 == (dc->options & GNUNET_FS_DOWNLOAD_IS_PROBE)) 2338 &deactivate_fs_download,
2313 ? GNUNET_FS_QUEUE_PRIORITY_NORMAL 2339 dc, (dc->length + DBLOCK_SIZE - 1) / DBLOCK_SIZE,
2314 : GNUNET_FS_QUEUE_PRIORITY_PROBE); 2340 (0 == (dc->options & GNUNET_FS_DOWNLOAD_IS_PROBE))
2341 ? GNUNET_FS_QUEUE_PRIORITY_NORMAL
2342 : GNUNET_FS_QUEUE_PRIORITY_PROBE);
2315 2343
2316} 2344}
2317 2345
@@ -2323,7 +2351,8 @@ GNUNET_FS_download_resume (struct GNUNET_FS_DownloadContext *dc)
2323 * @param do_delete delete files of incomplete downloads 2351 * @param do_delete delete files of incomplete downloads
2324 */ 2352 */
2325void 2353void
2326GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, int do_delete) 2354GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc,
2355 int do_delete)
2327{ 2356{
2328 struct GNUNET_FS_ProgressInfo pi; 2357 struct GNUNET_FS_ProgressInfo pi;
2329 int have_children; 2358 int have_children;
@@ -2357,7 +2386,8 @@ GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, int do_delete)
2357 while (NULL != dc->child_head) 2386 while (NULL != dc->child_head)
2358 GNUNET_FS_download_stop (dc->child_head, do_delete); 2387 GNUNET_FS_download_stop (dc->child_head, do_delete);
2359 if (NULL != dc->parent) 2388 if (NULL != dc->parent)
2360 GNUNET_CONTAINER_DLL_remove (dc->parent->child_head, dc->parent->child_tail, 2389 GNUNET_CONTAINER_DLL_remove (dc->parent->child_head,
2390 dc->parent->child_tail,
2361 dc); 2391 dc);
2362 if (NULL != dc->serialization) 2392 if (NULL != dc->serialization)
2363 GNUNET_FS_remove_sync_file_ (dc->h, 2393 GNUNET_FS_remove_sync_file_ (dc->h,
@@ -2385,7 +2415,8 @@ GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, int do_delete)
2385 { 2415 {
2386 if ( (0 != UNLINK (dc->filename)) && 2416 if ( (0 != UNLINK (dc->filename)) &&
2387 (ENOENT != errno) ) 2417 (ENOENT != errno) )
2388 GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", 2418 GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
2419 "unlink",
2389 dc->filename); 2420 dc->filename);
2390 } 2421 }
2391 GNUNET_free (dc->filename); 2422 GNUNET_free (dc->filename);
@@ -2395,7 +2426,8 @@ GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, int do_delete)
2395 if (NULL != dc->temp_filename) 2426 if (NULL != dc->temp_filename)
2396 { 2427 {
2397 if (0 != UNLINK (dc->temp_filename)) 2428 if (0 != UNLINK (dc->temp_filename))
2398 GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "unlink", 2429 GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
2430 "unlink",
2399 dc->temp_filename); 2431 dc->temp_filename);
2400 GNUNET_free (dc->temp_filename); 2432 GNUNET_free (dc->temp_filename);
2401 } 2433 }