aboutsummaryrefslogtreecommitdiff
path: root/src/fs/fs_dirmetascan.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2012-05-24 09:35:37 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2012-05-24 09:35:37 +0000
commit101f5787ac60dafa175950fb714c6d4cc4906478 (patch)
tree711c8042c8b22856b0946d0c819a3520498ac274 /src/fs/fs_dirmetascan.c
parent6743123dcc6b37dabf2759f384a7f6ad08a08bec (diff)
downloadgnunet-101f5787ac60dafa175950fb714c6d4cc4906478.tar.gz
gnunet-101f5787ac60dafa175950fb714c6d4cc4906478.zip
- adding return value to mst callback
Diffstat (limited to 'src/fs/fs_dirmetascan.c')
-rw-r--r--src/fs/fs_dirmetascan.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/fs/fs_dirmetascan.c b/src/fs/fs_dirmetascan.c
index 2c6d914ab..7d322e0d7 100644
--- a/src/fs/fs_dirmetascan.c
+++ b/src/fs/fs_dirmetascan.c
@@ -248,7 +248,7 @@ finish_scan (void *cls,
248 * @param client always NULL 248 * @param client always NULL
249 * @param msg message from the helper process 249 * @param msg message from the helper process
250 */ 250 */
251static void 251static int
252process_helper_msgs (void *cls, 252process_helper_msgs (void *cls,
253 void *client, 253 void *client,
254 const struct GNUNET_MessageHeader *msg) 254 const struct GNUNET_MessageHeader *msg)
@@ -281,7 +281,7 @@ process_helper_msgs (void *cls,
281 else 281 else
282 (void) expand_tree (ds->pos, 282 (void) expand_tree (ds->pos,
283 filename, GNUNET_NO); 283 filename, GNUNET_NO);
284 return; 284 return GNUNET_OK;
285 case GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_PROGRESS_DIRECTORY: 285 case GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_PROGRESS_DIRECTORY:
286 if (filename[left-1] != '\0') 286 if (filename[left-1] != '\0')
287 { 287 {
@@ -296,7 +296,7 @@ process_helper_msgs (void *cls,
296 break; 296 break;
297 } 297 }
298 ds->pos = ds->pos->parent; 298 ds->pos = ds->pos->parent;
299 return; 299 return GNUNET_OK;
300 } 300 }
301 ds->progress_callback (ds->progress_callback_cls, 301 ds->progress_callback (ds->progress_callback_cls,
302 filename, GNUNET_YES, 302 filename, GNUNET_YES,
@@ -305,7 +305,7 @@ process_helper_msgs (void *cls,
305 filename, GNUNET_YES); 305 filename, GNUNET_YES);
306 if (NULL == ds->toplevel) 306 if (NULL == ds->toplevel)
307 ds->toplevel = ds->pos; 307 ds->toplevel = ds->pos;
308 return; 308 return GNUNET_OK;
309 case GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_ERROR: 309 case GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_ERROR:
310 break; 310 break;
311 case GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_SKIP_FILE: 311 case GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_SKIP_FILE:
@@ -314,7 +314,7 @@ process_helper_msgs (void *cls,
314 ds->progress_callback (ds->progress_callback_cls, 314 ds->progress_callback (ds->progress_callback_cls,
315 filename, GNUNET_SYSERR, 315 filename, GNUNET_SYSERR,
316 GNUNET_FS_DIRSCANNER_FILE_IGNORED); 316 GNUNET_FS_DIRSCANNER_FILE_IGNORED);
317 return; 317 return GNUNET_OK;
318 case GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_COUNTING_DONE: 318 case GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_COUNTING_DONE:
319 if (0 != left) 319 if (0 != left)
320 { 320 {
@@ -332,7 +332,7 @@ process_helper_msgs (void *cls,
332 ds->pos = ds->toplevel; 332 ds->pos = ds->toplevel;
333 if (GNUNET_YES == ds->pos->is_directory) 333 if (GNUNET_YES == ds->pos->is_directory)
334 ds->pos = advance (ds->pos); 334 ds->pos = advance (ds->pos);
335 return; 335 return GNUNET_OK;
336 case GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_META_DATA: 336 case GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_META_DATA:
337 { 337 {
338 size_t nlen; 338 size_t nlen;
@@ -382,7 +382,7 @@ process_helper_msgs (void *cls,
382 } 382 }
383 ds->pos->ksk_uri = GNUNET_FS_uri_ksk_create_from_meta_data (ds->pos->meta); 383 ds->pos->ksk_uri = GNUNET_FS_uri_ksk_create_from_meta_data (ds->pos->meta);
384 ds->pos = advance (ds->pos); 384 ds->pos = advance (ds->pos);
385 return; 385 return GNUNET_OK;
386 } 386 }
387 case GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_FINISHED: 387 case GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_FINISHED:
388 if (NULL != ds->pos) 388 if (NULL != ds->pos)
@@ -402,7 +402,7 @@ process_helper_msgs (void *cls,
402 } 402 }
403 ds->stop_task = GNUNET_SCHEDULER_add_now (&finish_scan, 403 ds->stop_task = GNUNET_SCHEDULER_add_now (&finish_scan,
404 ds); 404 ds);
405 return; 405 return GNUNET_OK;
406 default: 406 default:
407 GNUNET_break (0); 407 GNUNET_break (0);
408 break; 408 break;
@@ -410,6 +410,7 @@ process_helper_msgs (void *cls,
410 ds->progress_callback (ds->progress_callback_cls, 410 ds->progress_callback (ds->progress_callback_cls,
411 NULL, GNUNET_SYSERR, 411 NULL, GNUNET_SYSERR,
412 GNUNET_FS_DIRSCANNER_INTERNAL_ERROR); 412 GNUNET_FS_DIRSCANNER_INTERNAL_ERROR);
413 return GNUNET_OK;
413} 414}
414 415
415 416