diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-04-26 20:25:37 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-04-26 20:25:37 +0200 |
commit | aa78134a557079ce570345e751e4c36c4b2ba79a (patch) | |
tree | f7bf25950513285184e2426109235337d0aef8be /src/fs | |
parent | 1f2674fe293be7c1a852fbe4a7241fbcb149078f (diff) | |
download | gnunet-aa78134a557079ce570345e751e4c36c4b2ba79a.tar.gz gnunet-aa78134a557079ce570345e751e4c36c4b2ba79a.zip |
-fix many more typos
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/fs_api.c | 72 | ||||
-rw-r--r-- | src/fs/fs_directory.c | 14 | ||||
-rw-r--r-- | src/fs/fs_download.c | 4 | ||||
-rw-r--r-- | src/fs/fs_publish.c | 4 | ||||
-rw-r--r-- | src/fs/fs_sharetree.c | 2 | ||||
-rw-r--r-- | src/fs/fs_tree.c | 2 | ||||
-rw-r--r-- | src/fs/fs_uri.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-publish.c | 2 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs.c | 2 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_cadet_client.c | 2 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_cp.c | 2 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_pe.c | 2 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_pr.c | 8 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_put.c | 2 | ||||
-rw-r--r-- | src/fs/test_fs_directory.c | 2 | ||||
-rw-r--r-- | src/fs/test_fs_file_information.c | 2 |
16 files changed, 63 insertions, 63 deletions
diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c index 920786146..63b17a93e 100644 --- a/src/fs/fs_api.c +++ b/src/fs/fs_api.c | |||
@@ -584,7 +584,7 @@ GNUNET_FS_data_reader_copy_ (void *cls, | |||
584 | * | 584 | * |
585 | * @param h master context | 585 | * @param h master context |
586 | * @param ext component of the path | 586 | * @param ext component of the path |
587 | * @param ent entity identifier (or emtpy string for the directory) | 587 | * @param ent entity identifier (or empty string for the directory) |
588 | * @return NULL on error | 588 | * @return NULL on error |
589 | */ | 589 | */ |
590 | static char * | 590 | static char * |
@@ -624,7 +624,7 @@ get_serialization_file_name (struct GNUNET_FS_Handle *h, | |||
624 | * @param h master context | 624 | * @param h master context |
625 | * @param ext component of the path | 625 | * @param ext component of the path |
626 | * @param uni name of the parent operation | 626 | * @param uni name of the parent operation |
627 | * @param ent entity identifier (or emtpy string for the directory) | 627 | * @param ent entity identifier (or empty string for the directory) |
628 | * @return NULL on error | 628 | * @return NULL on error |
629 | */ | 629 | */ |
630 | static char * | 630 | static char * |
@@ -664,7 +664,7 @@ get_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h, | |||
664 | * | 664 | * |
665 | * @param h master context | 665 | * @param h master context |
666 | * @param ext component of the path | 666 | * @param ext component of the path |
667 | * @param ent entity identifier (or emtpy string for the directory) | 667 | * @param ent entity identifier (or empty string for the directory) |
668 | * @return NULL on error | 668 | * @return NULL on error |
669 | */ | 669 | */ |
670 | static struct GNUNET_BIO_ReadHandle * | 670 | static struct GNUNET_BIO_ReadHandle * |
@@ -687,7 +687,7 @@ get_read_handle (struct GNUNET_FS_Handle *h, const char *ext, const char *ent) | |||
687 | * | 687 | * |
688 | * @param h master context | 688 | * @param h master context |
689 | * @param ext component of the path | 689 | * @param ext component of the path |
690 | * @param ent entity identifier (or emtpy string for the directory) | 690 | * @param ent entity identifier (or empty string for the directory) |
691 | * @return NULL on error | 691 | * @return NULL on error |
692 | */ | 692 | */ |
693 | static struct GNUNET_BIO_WriteHandle * | 693 | static struct GNUNET_BIO_WriteHandle * |
@@ -712,7 +712,7 @@ get_write_handle (struct GNUNET_FS_Handle *h, const char *ext, const char *ent) | |||
712 | * @param h master context | 712 | * @param h master context |
713 | * @param ext component of the path | 713 | * @param ext component of the path |
714 | * @param uni name of parent | 714 | * @param uni name of parent |
715 | * @param ent entity identifier (or emtpy string for the directory) | 715 | * @param ent entity identifier (or empty string for the directory) |
716 | * @return NULL on error | 716 | * @return NULL on error |
717 | */ | 717 | */ |
718 | static struct GNUNET_BIO_WriteHandle * | 718 | static struct GNUNET_BIO_WriteHandle * |
@@ -877,7 +877,7 @@ read_start_time (struct GNUNET_BIO_ReadHandle *rh, | |||
877 | * | 877 | * |
878 | * @param h master context | 878 | * @param h master context |
879 | * @param filename name of the file (without directory) with | 879 | * @param filename name of the file (without directory) with |
880 | * the infromation | 880 | * the information |
881 | * @return NULL on error | 881 | * @return NULL on error |
882 | */ | 882 | */ |
883 | static struct GNUNET_FS_FileInformation * | 883 | static struct GNUNET_FS_FileInformation * |
@@ -890,7 +890,7 @@ deserialize_file_information (struct GNUNET_FS_Handle *h, const char *filename); | |||
890 | * | 890 | * |
891 | * @param h master context | 891 | * @param h master context |
892 | * @param fn name of the file (without directory) with | 892 | * @param fn name of the file (without directory) with |
893 | * the infromation | 893 | * the information |
894 | * @param rh handle for reading | 894 | * @param rh handle for reading |
895 | * @return NULL on error | 895 | * @return NULL on error |
896 | */ | 896 | */ |
@@ -1152,7 +1152,7 @@ cleanup: | |||
1152 | * | 1152 | * |
1153 | * @param h master context | 1153 | * @param h master context |
1154 | * @param filename name of the file (without directory) with | 1154 | * @param filename name of the file (without directory) with |
1155 | * the infromation | 1155 | * the information |
1156 | * @return NULL on error | 1156 | * @return NULL on error |
1157 | */ | 1157 | */ |
1158 | static struct GNUNET_FS_FileInformation * | 1158 | static struct GNUNET_FS_FileInformation * |
@@ -1230,7 +1230,7 @@ get_serialization_short_name (const char *fullname) | |||
1230 | * | 1230 | * |
1231 | * @param h master context | 1231 | * @param h master context |
1232 | * @param ext component of the path | 1232 | * @param ext component of the path |
1233 | * @return NULL on errror | 1233 | * @return NULL on error |
1234 | */ | 1234 | */ |
1235 | static char * | 1235 | static char * |
1236 | make_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext) | 1236 | make_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext) |
@@ -1266,7 +1266,7 @@ make_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext) | |||
1266 | * @param h master context | 1266 | * @param h master context |
1267 | * @param ext component of the path | 1267 | * @param ext component of the path |
1268 | * @param uni name of parent | 1268 | * @param uni name of parent |
1269 | * @return NULL on errror | 1269 | * @return NULL on error |
1270 | */ | 1270 | */ |
1271 | static char * | 1271 | static char * |
1272 | make_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h, | 1272 | make_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h, |
@@ -2535,7 +2535,7 @@ static int | |||
2535 | deserialize_search_result (void *cls, const char *filename) | 2535 | deserialize_search_result (void *cls, const char *filename) |
2536 | { | 2536 | { |
2537 | struct GNUNET_FS_SearchContext *sc = cls; | 2537 | struct GNUNET_FS_SearchContext *sc = cls; |
2538 | char *ser; | 2538 | char *serialized; |
2539 | char *uris; | 2539 | char *uris; |
2540 | char *emsg; | 2540 | char *emsg; |
2541 | char *download; | 2541 | char *download; |
@@ -2544,19 +2544,19 @@ deserialize_search_result (void *cls, const char *filename) | |||
2544 | struct GNUNET_BIO_ReadHandle *drh; | 2544 | struct GNUNET_BIO_ReadHandle *drh; |
2545 | struct GNUNET_FS_SearchResult *sr; | 2545 | struct GNUNET_FS_SearchResult *sr; |
2546 | 2546 | ||
2547 | ser = get_serialization_short_name (filename); | 2547 | serialized = get_serialization_short_name (filename); |
2548 | rh = GNUNET_BIO_read_open_file (filename); | 2548 | rh = GNUNET_BIO_read_open_file (filename); |
2549 | if (NULL == rh) | 2549 | if (NULL == rh) |
2550 | { | 2550 | { |
2551 | if (NULL != ser) | 2551 | if (NULL != serialized) |
2552 | { | 2552 | { |
2553 | remove_sync_file_in_dir (sc->h, | 2553 | remove_sync_file_in_dir (sc->h, |
2554 | (NULL == sc->psearch_result) | 2554 | (NULL == sc->psearch_result) |
2555 | ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH | 2555 | ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH |
2556 | : GNUNET_FS_SYNC_PATH_CHILD_SEARCH, | 2556 | : GNUNET_FS_SYNC_PATH_CHILD_SEARCH, |
2557 | sc->serialization, | 2557 | sc->serialization, |
2558 | ser); | 2558 | serialized); |
2559 | GNUNET_free (ser); | 2559 | GNUNET_free (serialized); |
2560 | } | 2560 | } |
2561 | return GNUNET_OK; | 2561 | return GNUNET_OK; |
2562 | } | 2562 | } |
@@ -2567,7 +2567,7 @@ deserialize_search_result (void *cls, const char *filename) | |||
2567 | sr = GNUNET_new (struct GNUNET_FS_SearchResult); | 2567 | sr = GNUNET_new (struct GNUNET_FS_SearchResult); |
2568 | sr->h = sc->h; | 2568 | sr->h = sc->h; |
2569 | sr->sc = sc; | 2569 | sr->sc = sc; |
2570 | sr->serialization = ser; | 2570 | sr->serialization = serialized; |
2571 | if ((GNUNET_OK != | 2571 | if ((GNUNET_OK != |
2572 | GNUNET_BIO_read_string (rh, "result-uri", &uris, 10 * 1024)) || | 2572 | GNUNET_BIO_read_string (rh, "result-uri", &uris, 10 * 1024)) || |
2573 | (NULL == (sr->uri = GNUNET_FS_uri_parse (uris, &emsg))) || | 2573 | (NULL == (sr->uri = GNUNET_FS_uri_parse (uris, &emsg))) || |
@@ -2850,32 +2850,32 @@ static int | |||
2850 | deserialize_subdownload (void *cls, const char *filename) | 2850 | deserialize_subdownload (void *cls, const char *filename) |
2851 | { | 2851 | { |
2852 | struct GNUNET_FS_DownloadContext *parent = cls; | 2852 | struct GNUNET_FS_DownloadContext *parent = cls; |
2853 | char *ser; | 2853 | char *serialized; |
2854 | char *emsg; | 2854 | char *emsg; |
2855 | struct GNUNET_BIO_ReadHandle *rh; | 2855 | struct GNUNET_BIO_ReadHandle *rh; |
2856 | 2856 | ||
2857 | ser = get_serialization_short_name (filename); | 2857 | serialized = get_serialization_short_name (filename); |
2858 | rh = GNUNET_BIO_read_open_file (filename); | 2858 | rh = GNUNET_BIO_read_open_file (filename); |
2859 | if (NULL == rh) | 2859 | if (NULL == rh) |
2860 | { | 2860 | { |
2861 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 2861 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
2862 | _ ( | 2862 | _ ( |
2863 | "Failed to resume sub-download `%s': could not open file `%s'\n"), | 2863 | "Failed to resume sub-download `%s': could not open file `%s'\n"), |
2864 | ser, | 2864 | serialized, |
2865 | filename); | 2865 | filename); |
2866 | GNUNET_free (ser); | 2866 | GNUNET_free (serialized); |
2867 | return GNUNET_OK; | 2867 | return GNUNET_OK; |
2868 | } | 2868 | } |
2869 | deserialize_download (parent->h, rh, parent, NULL, ser); | 2869 | deserialize_download (parent->h, rh, parent, NULL, serialized); |
2870 | if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)) | 2870 | if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)) |
2871 | { | 2871 | { |
2872 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 2872 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
2873 | _ ("Failed to resume sub-download `%s': %s\n"), | 2873 | _ ("Failed to resume sub-download `%s': %s\n"), |
2874 | ser, | 2874 | serialized, |
2875 | emsg); | 2875 | emsg); |
2876 | GNUNET_free (emsg); | 2876 | GNUNET_free (emsg); |
2877 | } | 2877 | } |
2878 | GNUNET_free (ser); | 2878 | GNUNET_free (serialized); |
2879 | return GNUNET_OK; | 2879 | return GNUNET_OK; |
2880 | } | 2880 | } |
2881 | 2881 | ||
@@ -3146,7 +3146,7 @@ static int | |||
3146 | deserialize_search_file (void *cls, const char *filename) | 3146 | deserialize_search_file (void *cls, const char *filename) |
3147 | { | 3147 | { |
3148 | struct GNUNET_FS_Handle *h = cls; | 3148 | struct GNUNET_FS_Handle *h = cls; |
3149 | char *ser; | 3149 | char *set; |
3150 | char *emsg; | 3150 | char *emsg; |
3151 | struct GNUNET_BIO_ReadHandle *rh; | 3151 | struct GNUNET_BIO_ReadHandle *rh; |
3152 | struct GNUNET_FS_SearchContext *sc; | 3152 | struct GNUNET_FS_SearchContext *sc; |
@@ -3159,21 +3159,21 @@ deserialize_search_file (void *cls, const char *filename) | |||
3159 | } | 3159 | } |
3160 | if (S_ISDIR (buf.st_mode)) | 3160 | if (S_ISDIR (buf.st_mode)) |
3161 | return GNUNET_OK; /* skip directories */ | 3161 | return GNUNET_OK; /* skip directories */ |
3162 | ser = get_serialization_short_name (filename); | 3162 | set = get_serialization_short_name (filename); |
3163 | rh = GNUNET_BIO_read_open_file (filename); | 3163 | rh = GNUNET_BIO_read_open_file (filename); |
3164 | if (NULL == rh) | 3164 | if (NULL == rh) |
3165 | { | 3165 | { |
3166 | if (NULL != ser) | 3166 | if (NULL != set) |
3167 | { | 3167 | { |
3168 | GNUNET_FS_remove_sync_file_ (h, GNUNET_FS_SYNC_PATH_MASTER_SEARCH, ser); | 3168 | GNUNET_FS_remove_sync_file_ (h, GNUNET_FS_SYNC_PATH_MASTER_SEARCH, set); |
3169 | GNUNET_free (ser); | 3169 | GNUNET_free (set); |
3170 | } | 3170 | } |
3171 | return GNUNET_OK; | 3171 | return GNUNET_OK; |
3172 | } | 3172 | } |
3173 | sc = deserialize_search (h, rh, NULL, ser); | 3173 | sc = deserialize_search (h, rh, NULL, set); |
3174 | if (NULL != sc) | 3174 | if (NULL != sc) |
3175 | sc->top = GNUNET_FS_make_top (h, &GNUNET_FS_search_signal_suspend_, sc); | 3175 | sc->top = GNUNET_FS_make_top (h, &GNUNET_FS_search_signal_suspend_, sc); |
3176 | GNUNET_free (ser); | 3176 | GNUNET_free (set); |
3177 | if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)) | 3177 | if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)) |
3178 | { | 3178 | { |
3179 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 3179 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
@@ -3198,21 +3198,21 @@ static int | |||
3198 | deserialize_download_file (void *cls, const char *filename) | 3198 | deserialize_download_file (void *cls, const char *filename) |
3199 | { | 3199 | { |
3200 | struct GNUNET_FS_Handle *h = cls; | 3200 | struct GNUNET_FS_Handle *h = cls; |
3201 | char *ser; | 3201 | char *set; |
3202 | char *emsg; | 3202 | char *emsg; |
3203 | struct GNUNET_BIO_ReadHandle *rh; | 3203 | struct GNUNET_BIO_ReadHandle *rh; |
3204 | 3204 | ||
3205 | ser = get_serialization_short_name (filename); | 3205 | set = get_serialization_short_name (filename); |
3206 | rh = GNUNET_BIO_read_open_file (filename); | 3206 | rh = GNUNET_BIO_read_open_file (filename); |
3207 | if (NULL == rh) | 3207 | if (NULL == rh) |
3208 | { | 3208 | { |
3209 | if (0 != unlink (filename)) | 3209 | if (0 != unlink (filename)) |
3210 | GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename); | 3210 | GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename); |
3211 | GNUNET_free (ser); | 3211 | GNUNET_free (set); |
3212 | return GNUNET_OK; | 3212 | return GNUNET_OK; |
3213 | } | 3213 | } |
3214 | deserialize_download (h, rh, NULL, NULL, ser); | 3214 | deserialize_download (h, rh, NULL, NULL, set); |
3215 | GNUNET_free (ser); | 3215 | GNUNET_free (set); |
3216 | if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)) | 3216 | if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)) |
3217 | { | 3217 | { |
3218 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 3218 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
@@ -3226,7 +3226,7 @@ deserialize_download_file (void *cls, const char *filename) | |||
3226 | 3226 | ||
3227 | 3227 | ||
3228 | /** | 3228 | /** |
3229 | * Deserialize informatin about pending operations. | 3229 | * Deserialize information about pending operations. |
3230 | * | 3230 | * |
3231 | * @param master_path which master directory should be scanned | 3231 | * @param master_path which master directory should be scanned |
3232 | * @param proc function to call for each entry (will get @a h for 'cls') | 3232 | * @param proc function to call for each entry (will get @a h for 'cls') |
diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c index 9f0f12611..eb7aac5bb 100644 --- a/src/fs/fs_directory.c +++ b/src/fs/fs_directory.c | |||
@@ -350,7 +350,7 @@ struct GNUNET_FS_DirectoryBuilder | |||
350 | struct BuilderEntry *head; | 350 | struct BuilderEntry *head; |
351 | 351 | ||
352 | /** | 352 | /** |
353 | * Number of entires in the directory. | 353 | * Number of entries in the directory. |
354 | */ | 354 | */ |
355 | unsigned int count; | 355 | unsigned int count; |
356 | }; | 356 | }; |
@@ -401,7 +401,7 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld, | |||
401 | size_t mds; | 401 | size_t mds; |
402 | size_t mdxs; | 402 | size_t mdxs; |
403 | char *uris; | 403 | char *uris; |
404 | char *ser; | 404 | char *serialized; |
405 | char *sptr; | 405 | char *sptr; |
406 | size_t slen; | 406 | size_t slen; |
407 | struct GNUNET_CONTAINER_MetaData *meta; | 407 | struct GNUNET_CONTAINER_MetaData *meta; |
@@ -456,10 +456,10 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld, | |||
456 | mds = GNUNET_MAX_MALLOC_CHECKED / 2; | 456 | mds = GNUNET_MAX_MALLOC_CHECKED / 2; |
457 | e = GNUNET_malloc (sizeof(struct BuilderEntry) + slen + mds | 457 | e = GNUNET_malloc (sizeof(struct BuilderEntry) + slen + mds |
458 | + sizeof(uint32_t)); | 458 | + sizeof(uint32_t)); |
459 | ser = (char *) &e[1]; | 459 | serialized = (char *) &e[1]; |
460 | GNUNET_memcpy (ser, uris, slen); | 460 | GNUNET_memcpy (serialized, uris, slen); |
461 | GNUNET_free (uris); | 461 | GNUNET_free (uris); |
462 | sptr = &ser[slen + sizeof(uint32_t)]; | 462 | sptr = &serialized[slen + sizeof(uint32_t)]; |
463 | ret = | 463 | ret = |
464 | GNUNET_CONTAINER_meta_data_serialize (meta_use, &sptr, mds, | 464 | GNUNET_CONTAINER_meta_data_serialize (meta_use, &sptr, mds, |
465 | GNUNET_CONTAINER_META_DATA_SERIALIZE_PART); | 465 | GNUNET_CONTAINER_META_DATA_SERIALIZE_PART); |
@@ -470,7 +470,7 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld, | |||
470 | else | 470 | else |
471 | mds = ret; | 471 | mds = ret; |
472 | big = htonl (mds); | 472 | big = htonl (mds); |
473 | GNUNET_memcpy (&ser[slen], &big, sizeof(uint32_t)); | 473 | GNUNET_memcpy (&serialized[slen], &big, sizeof(uint32_t)); |
474 | e->len = slen + sizeof(uint32_t) + mds; | 474 | e->len = slen + sizeof(uint32_t) + mds; |
475 | e->next = bld->head; | 475 | e->next = bld->head; |
476 | bld->head = e; | 476 | bld->head = e; |
@@ -496,7 +496,7 @@ do_align (size_t start_position, size_t end_position) | |||
496 | 496 | ||
497 | 497 | ||
498 | /** | 498 | /** |
499 | * Compute a permuation of the blocks to | 499 | * Compute a permutation of the blocks to |
500 | * minimize the cost of alignment. Greedy packer. | 500 | * minimize the cost of alignment. Greedy packer. |
501 | * | 501 | * |
502 | * @param start starting position for the first block | 502 | * @param start starting position for the first block |
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c index 1f8ce7c05..5c98d224a 100644 --- a/src/fs/fs_download.c +++ b/src/fs/fs_download.c | |||
@@ -343,7 +343,7 @@ full_recursive_download (struct GNUNET_FS_DownloadContext *dc) | |||
343 | GNUNET_log ( | 343 | GNUNET_log ( |
344 | GNUNET_ERROR_TYPE_WARNING, | 344 | GNUNET_ERROR_TYPE_WARNING, |
345 | _ ( | 345 | _ ( |
346 | "Failed to access full directroy contents of `%s' for recursive download\n"), | 346 | "Failed to access full directory contents of `%s' for recursive download\n"), |
347 | dc->filename); | 347 | dc->filename); |
348 | } | 348 | } |
349 | GNUNET_DISK_file_unmap (m); | 349 | GNUNET_DISK_file_unmap (m); |
@@ -1431,7 +1431,7 @@ try_reconnect (struct GNUNET_FS_DownloadContext *dc) | |||
1431 | * We're allowed to ask the FS service for our blocks. Start the download. | 1431 | * We're allowed to ask the FS service for our blocks. Start the download. |
1432 | * | 1432 | * |
1433 | * @param cls the 'struct GNUNET_FS_DownloadContext' | 1433 | * @param cls the 'struct GNUNET_FS_DownloadContext' |
1434 | * @param mq handle to use for communcation with FS (we must destroy it!) | 1434 | * @param mq handle to use for communication with FS (we must destroy it!) |
1435 | */ | 1435 | */ |
1436 | static void | 1436 | static void |
1437 | activate_fs_download (void *cls) | 1437 | activate_fs_download (void *cls) |
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index fddc65d67..f891f37a1 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c | |||
@@ -1431,7 +1431,7 @@ compute_contents_size (struct GNUNET_FS_FileInformation *fi) | |||
1431 | * @param h handle to the file sharing subsystem | 1431 | * @param h handle to the file sharing subsystem |
1432 | * @param fi information about the file or directory structure to publish | 1432 | * @param fi information about the file or directory structure to publish |
1433 | * @param ns namespace to publish the file in, NULL for no namespace | 1433 | * @param ns namespace to publish the file in, NULL for no namespace |
1434 | * @param nid identifier to use for the publishd content in the namespace | 1434 | * @param nid identifier to use for the published content in the namespace |
1435 | * (can be NULL, must be NULL if namespace is NULL) | 1435 | * (can be NULL, must be NULL if namespace is NULL) |
1436 | * @param nuid update-identifier that will be used for future updates | 1436 | * @param nuid update-identifier that will be used for future updates |
1437 | * (can be NULL, must be NULL if namespace or nid is NULL) | 1437 | * (can be NULL, must be NULL if namespace or nid is NULL) |
@@ -1560,7 +1560,7 @@ fip_signal_stop (void *cls, | |||
1560 | 1560 | ||
1561 | /** | 1561 | /** |
1562 | * Stop an upload. Will abort incomplete uploads (but | 1562 | * Stop an upload. Will abort incomplete uploads (but |
1563 | * not remove blocks that have already been publishd) or | 1563 | * not remove blocks that have already been published) or |
1564 | * simply clean up the state for completed uploads. | 1564 | * simply clean up the state for completed uploads. |
1565 | * Must NOT be called from within the event callback! | 1565 | * Must NOT be called from within the event callback! |
1566 | * | 1566 | * |
diff --git a/src/fs/fs_sharetree.c b/src/fs/fs_sharetree.c index d5e75f9be..3610b202e 100644 --- a/src/fs/fs_sharetree.c +++ b/src/fs/fs_sharetree.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | /** | 33 | /** |
34 | * Entry for each unique keyword to track how often | 34 | * Entry for each unique keyword to track how often |
35 | * it occured. Contains the keyword and the counter. | 35 | * it occurred. Contains the keyword and the counter. |
36 | */ | 36 | */ |
37 | struct KeywordCounter | 37 | struct KeywordCounter |
38 | { | 38 | { |
diff --git a/src/fs/fs_tree.c b/src/fs/fs_tree.c index 6203690d2..4d49809f8 100644 --- a/src/fs/fs_tree.c +++ b/src/fs/fs_tree.c | |||
@@ -434,7 +434,7 @@ GNUNET_FS_tree_encoder_get_uri (struct GNUNET_FS_TreeEncoder *te) | |||
434 | * about possible errors. | 434 | * about possible errors. |
435 | * | 435 | * |
436 | * @param te the tree encoder to clean up | 436 | * @param te the tree encoder to clean up |
437 | * @param emsg set to an error message (if an error occured | 437 | * @param emsg set to an error message (if an error occurred |
438 | * within the tree encoder; if this function is called | 438 | * within the tree encoder; if this function is called |
439 | * prior to completion and prior to an internal error, | 439 | * prior to completion and prior to an internal error, |
440 | * both "*emsg" will be set to NULL). | 440 | * both "*emsg" will be set to NULL). |
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c index 4d1b7c6f0..73ea5d60d 100644 --- a/src/fs/fs_uri.c +++ b/src/fs/fs_uri.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * | 25 | * |
26 | * GNUnet URIs are of the general form "gnunet://MODULE/IDENTIFIER". | 26 | * GNUnet URIs are of the general form "gnunet://MODULE/IDENTIFIER". |
27 | * The specific structure of "IDENTIFIER" depends on the module and | 27 | * The specific structure of "IDENTIFIER" depends on the module and |
28 | * maybe differenciated into additional subcategories if applicable. | 28 | * maybe differentiated into additional subcategories if applicable. |
29 | * This module only deals with fs identifiers (MODULE = "fs"). | 29 | * This module only deals with fs identifiers (MODULE = "fs"). |
30 | * <p> | 30 | * <p> |
31 | * | 31 | * |
@@ -213,7 +213,7 @@ GNUNET_FS_uri_ksk_to_string_fancy (const struct GNUNET_FS_Uri *uri) | |||
213 | * | 213 | * |
214 | * @param in string with %-encoding | 214 | * @param in string with %-encoding |
215 | * @param emsg where to store the parser error message (if any) | 215 | * @param emsg where to store the parser error message (if any) |
216 | * @return decodded string with leading space (or preserved plus) | 216 | * @return decoded string with leading space (or preserved plus) |
217 | */ | 217 | */ |
218 | static char * | 218 | static char * |
219 | percent_decode_keyword (const char *in, char **emsg) | 219 | percent_decode_keyword (const char *in, char **emsg) |
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c index dea467669..c62edcd61 100644 --- a/src/fs/gnunet-publish.c +++ b/src/fs/gnunet-publish.c | |||
@@ -508,7 +508,7 @@ uri_ksk_continuation (void *cls, | |||
508 | * Iterate over the results from the directory scan and extract | 508 | * Iterate over the results from the directory scan and extract |
509 | * the desired information for the publishing operation. | 509 | * the desired information for the publishing operation. |
510 | * | 510 | * |
511 | * @param item root with the data from the directroy scan | 511 | * @param item root with the data from the directory scan |
512 | * @return handle with the information for the publishing operation | 512 | * @return handle with the information for the publishing operation |
513 | */ | 513 | */ |
514 | static struct GNUNET_FS_FileInformation * | 514 | static struct GNUNET_FS_FileInformation * |
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index cf9069918..e90ba4c8b 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -63,7 +63,7 @@ | |||
63 | GNUNET_TIME_UNIT_SECONDS, 5) | 63 | GNUNET_TIME_UNIT_SECONDS, 5) |
64 | 64 | ||
65 | /** | 65 | /** |
66 | * Collect an instane number of statistics? May cause excessive IPC. | 66 | * Collect an instance number of statistics? May cause excessive IPC. |
67 | */ | 67 | */ |
68 | #define INSANE_STATISTICS GNUNET_NO | 68 | #define INSANE_STATISTICS GNUNET_NO |
69 | 69 | ||
diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/fs/gnunet-service-fs_cadet_client.c index 96ccf8232..398fcd604 100644 --- a/src/fs/gnunet-service-fs_cadet_client.c +++ b/src/fs/gnunet-service-fs_cadet_client.c | |||
@@ -655,7 +655,7 @@ GSF_cadet_query (const struct GNUNET_PeerIdentity *target, | |||
655 | 655 | ||
656 | /** | 656 | /** |
657 | * Cancel an active request; must not be called after 'proc' | 657 | * Cancel an active request; must not be called after 'proc' |
658 | * was calld. | 658 | * was called. |
659 | * | 659 | * |
660 | * @param sr request to cancel | 660 | * @param sr request to cancel |
661 | */ | 661 | */ |
diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c index dca8ae2a8..c174ad611 100644 --- a/src/fs/gnunet-service-fs_cp.c +++ b/src/fs/gnunet-service-fs_cp.c | |||
@@ -53,7 +53,7 @@ | |||
53 | 2) | 53 | 2) |
54 | 54 | ||
55 | /** | 55 | /** |
56 | * Collect an instane number of statistics? May cause excessive IPC. | 56 | * Collect an instance number of statistics? May cause excessive IPC. |
57 | */ | 57 | */ |
58 | #define INSANE_STATISTICS GNUNET_NO | 58 | #define INSANE_STATISTICS GNUNET_NO |
59 | 59 | ||
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c index bb4b07c02..60dd0ab70 100644 --- a/src/fs/gnunet-service-fs_pe.c +++ b/src/fs/gnunet-service-fs_pe.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include "gnunet-service-fs_pr.h" | 30 | #include "gnunet-service-fs_pr.h" |
31 | 31 | ||
32 | /** | 32 | /** |
33 | * Collect an instane number of statistics? May cause excessive IPC. | 33 | * Collect an instance number of statistics? May cause excessive IPC. |
34 | */ | 34 | */ |
35 | #define INSANE_STATISTICS GNUNET_NO | 35 | #define INSANE_STATISTICS GNUNET_NO |
36 | 36 | ||
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index 150dd72e2..a5db4b6b7 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c | |||
@@ -49,7 +49,7 @@ | |||
49 | /** | 49 | /** |
50 | * Bandwidth value of a 0-priority content (must be fairly high | 50 | * Bandwidth value of a 0-priority content (must be fairly high |
51 | * compared to query since content is typically significantly larger | 51 | * compared to query since content is typically significantly larger |
52 | * -- and more valueable since it can take many queries to get one | 52 | * -- and more valuable since it can take many queries to get one |
53 | * piece of content). | 53 | * piece of content). |
54 | */ | 54 | */ |
55 | #define CONTENT_BANDWIDTH_VALUE 800 | 55 | #define CONTENT_BANDWIDTH_VALUE 800 |
@@ -60,7 +60,7 @@ | |||
60 | #define MAX_RESULTS (100 * 1024) | 60 | #define MAX_RESULTS (100 * 1024) |
61 | 61 | ||
62 | /** | 62 | /** |
63 | * Collect an instane number of statistics? May cause excessive IPC. | 63 | * Collect an instance number of statistics? May cause excessive IPC. |
64 | */ | 64 | */ |
65 | #define INSANE_STATISTICS GNUNET_NO | 65 | #define INSANE_STATISTICS GNUNET_NO |
66 | 66 | ||
@@ -241,7 +241,7 @@ static unsigned long long max_pending_requests = (32 * 1024); | |||
241 | * will create a new bloom filter from scratch, so it should only be | 241 | * will create a new bloom filter from scratch, so it should only be |
242 | * called if we have no bloomfilter at all (and hence can create a | 242 | * called if we have no bloomfilter at all (and hence can create a |
243 | * fresh one of minimal size without problems) OR if our peer is the | 243 | * fresh one of minimal size without problems) OR if our peer is the |
244 | * initiator (in which case we may resize to larger than mimimum size). | 244 | * initiator (in which case we may resize to larger than minimum size). |
245 | * | 245 | * |
246 | * @param type type of the request | 246 | * @param type type of the request |
247 | * @param pr request for which the BF is to be recomputed | 247 | * @param pr request for which the BF is to be recomputed |
@@ -287,7 +287,7 @@ refresh_bloomfilter (enum GNUNET_BLOCK_Type type, struct GSF_PendingRequest *pr) | |||
287 | * @param bf_size number of bytes in @a bf_data | 287 | * @param bf_size number of bytes in @a bf_data |
288 | * @param mingle mingle value for bf | 288 | * @param mingle mingle value for bf |
289 | * @param anonymity_level desired anonymity level | 289 | * @param anonymity_level desired anonymity level |
290 | * @param priority maximum outgoing cummulative request priority to use | 290 | * @param priority maximum outgoing cumulative request priority to use |
291 | * @param ttl current time-to-live for the request | 291 | * @param ttl current time-to-live for the request |
292 | * @param sender_pid peer ID to use for the sender when forwarding, 0 for none | 292 | * @param sender_pid peer ID to use for the sender when forwarding, 0 for none |
293 | * @param origin_pid peer ID of origin of query (do not loop back) | 293 | * @param origin_pid peer ID of origin of query (do not loop back) |
diff --git a/src/fs/gnunet-service-fs_put.c b/src/fs/gnunet-service-fs_put.c index ddc15820a..93333b7a2 100644 --- a/src/fs/gnunet-service-fs_put.c +++ b/src/fs/gnunet-service-fs_put.c | |||
@@ -66,7 +66,7 @@ struct PutOperator | |||
66 | struct GNUNET_SCHEDULER_Task *dht_task; | 66 | struct GNUNET_SCHEDULER_Task *dht_task; |
67 | 67 | ||
68 | /** | 68 | /** |
69 | * How many entires with zero anonymity of our type do we currently | 69 | * How many entries with zero anonymity of our type do we currently |
70 | * estimate to have in the database? | 70 | * estimate to have in the database? |
71 | */ | 71 | */ |
72 | uint64_t zero_anonymity_count_estimate; | 72 | uint64_t zero_anonymity_count_estimate; |
diff --git a/src/fs/test_fs_directory.c b/src/fs/test_fs_directory.c index 1b109c4d4..908e7c555 100644 --- a/src/fs/test_fs_directory.c +++ b/src/fs/test_fs_directory.c | |||
@@ -139,7 +139,7 @@ testDirectory (unsigned int i) | |||
139 | (start), | 139 | (start), |
140 | GNUNET_YES); | 140 | GNUNET_YES); |
141 | fprintf (stdout, | 141 | fprintf (stdout, |
142 | "Creating directory with %u entires and total size %llu took %s\n", | 142 | "Creating directory with %u entries and total size %llu took %s\n", |
143 | i, (unsigned long long) dlen, s); | 143 | i, (unsigned long long) dlen, s); |
144 | if (i < 100) | 144 | if (i < 100) |
145 | { | 145 | { |
diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c index 9d0978e06..22013db27 100644 --- a/src/fs/test_fs_file_information.c +++ b/src/fs/test_fs_file_information.c | |||
@@ -24,7 +24,7 @@ | |||
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | * | 25 | * |
26 | * TODO: | 26 | * TODO: |
27 | * - test that metatdata, etc. are all correct (for example, | 27 | * - test that metadata, etc. are all correct (for example, |
28 | * there is a known bug with dirname never being set that is | 28 | * there is a known bug with dirname never being set that is |
29 | * not detected!) | 29 | * not detected!) |
30 | * - need to iterate over file-information structure | 30 | * - need to iterate over file-information structure |