diff options
Diffstat (limited to 'src/fs/fs_directory.c')
-rw-r--r-- | src/fs/fs_directory.c | 14 |
1 files changed, 7 insertions, 7 deletions
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 |