diff options
Diffstat (limited to 'src/fs/fs.h')
-rw-r--r-- | src/fs/fs.h | 65 |
1 files changed, 25 insertions, 40 deletions
diff --git a/src/fs/fs.h b/src/fs/fs.h index 1d3fc6611..68bab5916 100644 --- a/src/fs/fs.h +++ b/src/fs/fs.h | |||
@@ -788,17 +788,9 @@ void GNUNET_FS_dequeue_ (struct GNUNET_FS_QueueEntry *qh); | |||
788 | * @param emsg location for the reader to store an error message | 788 | * @param emsg location for the reader to store an error message |
789 | * @return number of bytes written, usually "max", 0 on error | 789 | * @return number of bytes written, usually "max", 0 on error |
790 | */ | 790 | */ |
791 | size_t | 791 | size_t GNUNET_FS_data_reader_file_ (void *cls, uint64_t offset, |
792 | 792 | size_t max, void *buf, | |
793 | 793 | char **emsg); | |
794 | |||
795 | |||
796 | |||
797 | |||
798 | |||
799 | GNUNET_FS_data_reader_file_ (void *cls, | ||
800 | uint64_t offset, | ||
801 | size_t max, void *buf, char **emsg); | ||
802 | 794 | ||
803 | 795 | ||
804 | /** | 796 | /** |
@@ -827,10 +819,8 @@ void *GNUNET_FS_make_file_reader_context_ (const char *filename); | |||
827 | * @param emsg location for the reader to store an error message | 819 | * @param emsg location for the reader to store an error message |
828 | * @return number of bytes written, usually "max", 0 on error | 820 | * @return number of bytes written, usually "max", 0 on error |
829 | */ | 821 | */ |
830 | size_t | 822 | size_t GNUNET_FS_data_reader_copy_ (void *cls, uint64_t offset, size_t max, |
831 | GNUNET_FS_data_reader_copy_ (void *cls, | 823 | void *buf, char **emsg); |
832 | uint64_t offset, | ||
833 | size_t max, void *buf, char **emsg); | ||
834 | 824 | ||
835 | /** | 825 | /** |
836 | * Notification of FS that a search probe has made progress. | 826 | * Notification of FS that a search probe has made progress. |
@@ -858,9 +848,8 @@ void *GNUNET_FS_search_probe_progress_ (void *cls, | |||
858 | * @param cls "struct GNUNET_FS_PublishContext" identifies the upload | 848 | * @param cls "struct GNUNET_FS_PublishContext" identifies the upload |
859 | * @param tc task context | 849 | * @param tc task context |
860 | */ | 850 | */ |
861 | void | 851 | void GNUNET_FS_publish_main_ (void *cls, |
862 | GNUNET_FS_publish_main_ (void *cls, | 852 | const struct GNUNET_SCHEDULER_TaskContext *tc); |
863 | const struct GNUNET_SCHEDULER_TaskContext *tc); | ||
864 | 853 | ||
865 | 854 | ||
866 | /** | 855 | /** |
@@ -870,8 +859,8 @@ GNUNET_FS_publish_main_ (void *cls, | |||
870 | * @param cls closure, unindex context | 859 | * @param cls closure, unindex context |
871 | * @param file_id computed hash, NULL on error | 860 | * @param file_id computed hash, NULL on error |
872 | */ | 861 | */ |
873 | void | 862 | void GNUNET_FS_unindex_process_hash_ (void *cls, |
874 | GNUNET_FS_unindex_process_hash_ (void *cls, const GNUNET_HashCode * file_id); | 863 | const GNUNET_HashCode * file_id); |
875 | 864 | ||
876 | 865 | ||
877 | /** | 866 | /** |
@@ -897,9 +886,8 @@ void *GNUNET_FS_publish_make_status_ (struct GNUNET_FS_ProgressInfo *pi, | |||
897 | * @param pi structure to fill in | 886 | * @param pi structure to fill in |
898 | * @param dc overall download context | 887 | * @param dc overall download context |
899 | */ | 888 | */ |
900 | void | 889 | void GNUNET_FS_download_make_status_ (struct GNUNET_FS_ProgressInfo *pi, |
901 | GNUNET_FS_download_make_status_ (struct GNUNET_FS_ProgressInfo *pi, | 890 | struct GNUNET_FS_DownloadContext *dc); |
902 | struct GNUNET_FS_DownloadContext *dc); | ||
903 | 891 | ||
904 | 892 | ||
905 | /** | 893 | /** |
@@ -909,9 +897,9 @@ GNUNET_FS_download_make_status_ (struct GNUNET_FS_ProgressInfo *pi, | |||
909 | * @param cls the 'struct GNUNET_FS_DownloadContext' | 897 | * @param cls the 'struct GNUNET_FS_DownloadContext' |
910 | * @param tc scheduler context | 898 | * @param tc scheduler context |
911 | */ | 899 | */ |
912 | void | 900 | void GNUNET_FS_download_start_task_ (void *cls, |
913 | GNUNET_FS_download_start_task_ (void *cls, | 901 | const struct GNUNET_SCHEDULER_TaskContext |
914 | const struct GNUNET_SCHEDULER_TaskContext *tc); | 902 | *tc); |
915 | 903 | ||
916 | 904 | ||
917 | 905 | ||
@@ -923,10 +911,9 @@ GNUNET_FS_download_start_task_ (void *cls, | |||
923 | * @param uc overall unindex context | 911 | * @param uc overall unindex context |
924 | * @param offset where we are in the file (for progress) | 912 | * @param offset where we are in the file (for progress) |
925 | */ | 913 | */ |
926 | void | 914 | void GNUNET_FS_unindex_make_status_ (struct GNUNET_FS_ProgressInfo *pi, |
927 | GNUNET_FS_unindex_make_status_ (struct GNUNET_FS_ProgressInfo *pi, | 915 | struct GNUNET_FS_UnindexContext *uc, |
928 | struct GNUNET_FS_UnindexContext *uc, | 916 | uint64_t offset); |
929 | uint64_t offset); | ||
930 | 917 | ||
931 | /** | 918 | /** |
932 | * Fill in all of the generic fields for a search event and | 919 | * Fill in all of the generic fields for a search event and |
@@ -961,8 +948,8 @@ int GNUNET_FS_search_start_searching_ (struct GNUNET_FS_SearchContext *sc); | |||
961 | * | 948 | * |
962 | * @param dc our download context | 949 | * @param dc our download context |
963 | */ | 950 | */ |
964 | void | 951 | void GNUNET_FS_download_start_downloading_ (struct GNUNET_FS_DownloadContext |
965 | GNUNET_FS_download_start_downloading_ (struct GNUNET_FS_DownloadContext *dc); | 952 | *dc); |
966 | 953 | ||
967 | 954 | ||
968 | /** | 955 | /** |
@@ -979,9 +966,8 @@ void GNUNET_FS_search_start_probe_ (struct GNUNET_FS_SearchResult *sr); | |||
979 | * @param ext component of the path | 966 | * @param ext component of the path |
980 | * @param ent entity identifier | 967 | * @param ent entity identifier |
981 | */ | 968 | */ |
982 | void | 969 | void GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h, const char *ext, |
983 | GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h, | 970 | const char *ent); |
984 | const char *ext, const char *ent); | ||
985 | 971 | ||
986 | 972 | ||
987 | /** | 973 | /** |
@@ -991,9 +977,8 @@ GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h, | |||
991 | * @param ext component of the path | 977 | * @param ext component of the path |
992 | * @param uni unique name of parent | 978 | * @param uni unique name of parent |
993 | */ | 979 | */ |
994 | void | 980 | void GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h, const char *ext, |
995 | GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h, | 981 | const char *uni); |
996 | const char *ext, const char *uni); | ||
997 | 982 | ||
998 | 983 | ||
999 | /** | 984 | /** |
@@ -1144,8 +1129,8 @@ struct TopLevelActivity *GNUNET_FS_make_top (struct GNUNET_FS_Handle *h, | |||
1144 | * @param h global fs handle | 1129 | * @param h global fs handle |
1145 | * @param top top level activity entry | 1130 | * @param top top level activity entry |
1146 | */ | 1131 | */ |
1147 | void | 1132 | void GNUNET_FS_end_top (struct GNUNET_FS_Handle *h, |
1148 | GNUNET_FS_end_top (struct GNUNET_FS_Handle *h, struct TopLevelActivity *top); | 1133 | struct TopLevelActivity *top); |
1149 | 1134 | ||
1150 | 1135 | ||
1151 | 1136 | ||