diff options
Diffstat (limited to 'src/util/disk.c')
-rw-r--r-- | src/util/disk.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/util/disk.c b/src/util/disk.c index 265295922..307c4535b 100644 --- a/src/util/disk.c +++ b/src/util/disk.c | |||
@@ -810,10 +810,6 @@ GNUNET_DISK_directory_scan (const char *dirName, | |||
810 | */ | 810 | */ |
811 | struct GNUNET_DISK_DirectoryIterator | 811 | struct GNUNET_DISK_DirectoryIterator |
812 | { | 812 | { |
813 | /** | ||
814 | * Our scheduler. | ||
815 | */ | ||
816 | struct GNUNET_SCHEDULER_Handle *sched; | ||
817 | 813 | ||
818 | /** | 814 | /** |
819 | * Function to call on directory entries. | 815 | * Function to call on directory entries. |
@@ -906,8 +902,7 @@ GNUNET_DISK_directory_iterator_next (struct GNUNET_DISK_DirectoryIterator | |||
906 | GNUNET_DISK_directory_iterator_next (iter, GNUNET_YES); | 902 | GNUNET_DISK_directory_iterator_next (iter, GNUNET_YES); |
907 | return GNUNET_NO; | 903 | return GNUNET_NO; |
908 | } | 904 | } |
909 | GNUNET_SCHEDULER_add_with_priority (iter->sched, | 905 | GNUNET_SCHEDULER_add_with_priority (iter->priority, |
910 | iter->priority, | ||
911 | &directory_iterator_task, iter); | 906 | &directory_iterator_task, iter); |
912 | return GNUNET_YES; | 907 | return GNUNET_YES; |
913 | } | 908 | } |
@@ -919,15 +914,13 @@ GNUNET_DISK_directory_iterator_next (struct GNUNET_DISK_DirectoryIterator | |||
919 | * If a scheduler does not need to be used, GNUNET_DISK_directory_scan | 914 | * If a scheduler does not need to be used, GNUNET_DISK_directory_scan |
920 | * may provide a simpler API. | 915 | * may provide a simpler API. |
921 | * | 916 | * |
922 | * @param sched scheduler to use | ||
923 | * @param prio priority to use | 917 | * @param prio priority to use |
924 | * @param dirName the name of the directory | 918 | * @param dirName the name of the directory |
925 | * @param callback the method to call for each file | 919 | * @param callback the method to call for each file |
926 | * @param callback_cls closure for callback | 920 | * @param callback_cls closure for callback |
927 | */ | 921 | */ |
928 | void | 922 | void |
929 | GNUNET_DISK_directory_iterator_start (struct GNUNET_SCHEDULER_Handle *sched, | 923 | GNUNET_DISK_directory_iterator_start (enum GNUNET_SCHEDULER_Priority prio, |
930 | enum GNUNET_SCHEDULER_Priority prio, | ||
931 | const char *dirName, | 924 | const char *dirName, |
932 | GNUNET_DISK_DirectoryIteratorCallback | 925 | GNUNET_DISK_DirectoryIteratorCallback |
933 | callback, void *callback_cls) | 926 | callback, void *callback_cls) |
@@ -935,7 +928,6 @@ GNUNET_DISK_directory_iterator_start (struct GNUNET_SCHEDULER_Handle *sched, | |||
935 | struct GNUNET_DISK_DirectoryIterator *di; | 928 | struct GNUNET_DISK_DirectoryIterator *di; |
936 | 929 | ||
937 | di = GNUNET_malloc (sizeof (struct GNUNET_DISK_DirectoryIterator)); | 930 | di = GNUNET_malloc (sizeof (struct GNUNET_DISK_DirectoryIterator)); |
938 | di->sched = sched; | ||
939 | di->callback = callback; | 931 | di->callback = callback; |
940 | di->callback_cls = callback_cls; | 932 | di->callback_cls = callback_cls; |
941 | di->directory = OPENDIR (dirName); | 933 | di->directory = OPENDIR (dirName); |