diff options
Diffstat (limited to 'src/fs/fs_unindex.c')
-rw-r--r-- | src/fs/fs_unindex.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c index ecf14112c..7e189d697 100644 --- a/src/fs/fs_unindex.c +++ b/src/fs/fs_unindex.c | |||
@@ -322,8 +322,8 @@ unindex_finish (struct GNUNET_FS_UnindexContext *uc) | |||
322 | * @param reason kind of progress we are making | 322 | * @param reason kind of progress we are making |
323 | */ | 323 | */ |
324 | static void | 324 | static void |
325 | unindex_directory_scan_cb (void *cls, | 325 | unindex_directory_scan_cb (void *cls, |
326 | const char *filename, | 326 | const char *filename, |
327 | int is_directory, | 327 | int is_directory, |
328 | enum GNUNET_FS_DirScannerProgressUpdateReason reason) | 328 | enum GNUNET_FS_DirScannerProgressUpdateReason reason) |
329 | { | 329 | { |
@@ -381,7 +381,7 @@ GNUNET_FS_unindex_do_extract_keywords_ (struct GNUNET_FS_UnindexContext *uc) | |||
381 | ex = NULL; | 381 | ex = NULL; |
382 | uc->dscan = GNUNET_FS_directory_scan_start (uc->filename, | 382 | uc->dscan = GNUNET_FS_directory_scan_start (uc->filename, |
383 | GNUNET_NO, ex, | 383 | GNUNET_NO, ex, |
384 | &unindex_directory_scan_cb, | 384 | &unindex_directory_scan_cb, |
385 | uc); | 385 | uc); |
386 | GNUNET_free_non_null (ex); | 386 | GNUNET_free_non_null (ex); |
387 | } | 387 | } |
@@ -391,7 +391,7 @@ GNUNET_FS_unindex_do_extract_keywords_ (struct GNUNET_FS_UnindexContext *uc) | |||
391 | * Continuation called to notify client about result of the remove | 391 | * Continuation called to notify client about result of the remove |
392 | * operation for the UBlock. | 392 | * operation for the UBlock. |
393 | * | 393 | * |
394 | * @param cls the 'struct GNUNET_FS_UnindexContext *' | 394 | * @param cls the 'struct GNUNET_FS_UnindexContext *' |
395 | * @param success GNUNET_SYSERR on failure (including timeout/queue drop) | 395 | * @param success GNUNET_SYSERR on failure (including timeout/queue drop) |
396 | * GNUNET_NO if content was already there | 396 | * GNUNET_NO if content was already there |
397 | * GNUNET_YES (or other positive value) on success | 397 | * GNUNET_YES (or other positive value) on success |
@@ -409,10 +409,10 @@ continue_after_remove (void *cls, | |||
409 | struct GNUNET_FS_UnindexContext *uc = cls; | 409 | struct GNUNET_FS_UnindexContext *uc = cls; |
410 | 410 | ||
411 | uc->dqe = NULL; | 411 | uc->dqe = NULL; |
412 | if (success != GNUNET_YES) | 412 | if (success != GNUNET_YES) |
413 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 413 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
414 | _("Failed to remove UBlock: %s\n"), | 414 | _("Failed to remove UBlock: %s\n"), |
415 | msg); | 415 | msg); |
416 | uc->ksk_offset++; | 416 | uc->ksk_offset++; |
417 | GNUNET_FS_unindex_do_remove_kblocks_ (uc); | 417 | GNUNET_FS_unindex_do_remove_kblocks_ (uc); |
418 | } | 418 | } |
@@ -464,14 +464,14 @@ process_kblock_for_unindex (void *cls, | |||
464 | if (0 == uc->first_uid) | 464 | if (0 == uc->first_uid) |
465 | { | 465 | { |
466 | /* remember UID of first result to detect cycles */ | 466 | /* remember UID of first result to detect cycles */ |
467 | uc->first_uid = uid; | 467 | uc->first_uid = uid; |
468 | } | 468 | } |
469 | else if (uid == uc->first_uid) | 469 | else if (uid == uc->first_uid) |
470 | { | 470 | { |
471 | /* no more additional results */ | 471 | /* no more additional results */ |
472 | uc->ksk_offset++; | 472 | uc->ksk_offset++; |
473 | GNUNET_FS_unindex_do_remove_kblocks_ (uc); | 473 | GNUNET_FS_unindex_do_remove_kblocks_ (uc); |
474 | return; | 474 | return; |
475 | } | 475 | } |
476 | GNUNET_assert (GNUNET_BLOCK_TYPE_FS_UBLOCK == type); | 476 | GNUNET_assert (GNUNET_BLOCK_TYPE_FS_UBLOCK == type); |
477 | if (size < sizeof (struct UBlock)) | 477 | if (size < sizeof (struct UBlock)) |
@@ -489,10 +489,10 @@ process_kblock_for_unindex (void *cls, | |||
489 | goto get_next; | 489 | goto get_next; |
490 | } | 490 | } |
491 | { | 491 | { |
492 | char pt[size - sizeof (struct UBlock)]; | 492 | char pt[size - sizeof (struct UBlock)]; |
493 | struct GNUNET_CRYPTO_EccPublicSignKey anon_pub; | 493 | struct GNUNET_CRYPTO_EccPublicSignKey anon_pub; |
494 | const char *keyword; | 494 | const char *keyword; |
495 | 495 | ||
496 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (GNUNET_CRYPTO_ecc_key_get_anonymous (), | 496 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (GNUNET_CRYPTO_ecc_key_get_anonymous (), |
497 | &anon_pub); | 497 | &anon_pub); |
498 | keyword = &uc->ksk_uri->data.ksk.keywords[uc->ksk_offset][1]; | 498 | keyword = &uc->ksk_uri->data.ksk.keywords[uc->ksk_offset][1]; |
@@ -757,7 +757,7 @@ GNUNET_FS_unindex_signal_suspend_ (void *cls) | |||
757 | * @return NULL on error, otherwise handle | 757 | * @return NULL on error, otherwise handle |
758 | */ | 758 | */ |
759 | struct GNUNET_FS_UnindexContext * | 759 | struct GNUNET_FS_UnindexContext * |
760 | GNUNET_FS_unindex_start (struct GNUNET_FS_Handle *h, | 760 | GNUNET_FS_unindex_start (struct GNUNET_FS_Handle *h, |
761 | const char *filename, | 761 | const char *filename, |
762 | void *cctx) | 762 | void *cctx) |
763 | { | 763 | { |