aboutsummaryrefslogtreecommitdiff
path: root/src/fs/fs_directory.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
committerChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
commit5746309cb4be2073d550ad7a6885e918631dbc38 (patch)
tree89455bc4aadf977816b38df13f990372cd81d71a /src/fs/fs_directory.c
parent6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff)
downloadgnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz
gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip
indentation
Diffstat (limited to 'src/fs/fs_directory.c')
-rw-r--r--src/fs/fs_directory.c53
1 files changed, 23 insertions, 30 deletions
diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c
index f22480d5f..61ed1586f 100644
--- a/src/fs/fs_directory.c
+++ b/src/fs/fs_directory.c
@@ -88,11 +88,9 @@ GNUNET_FS_meta_data_make_directory (struct GNUNET_CONTAINER_MetaData *md)
88 GNUNET_free (mime); 88 GNUNET_free (mime);
89 return; 89 return;
90 } 90 }
91 GNUNET_CONTAINER_meta_data_insert (md, 91 GNUNET_CONTAINER_meta_data_insert (md, "<gnunet>",
92 "<gnunet>",
93 EXTRACTOR_METATYPE_MIMETYPE, 92 EXTRACTOR_METATYPE_MIMETYPE,
94 EXTRACTOR_METAFORMAT_UTF8, 93 EXTRACTOR_METAFORMAT_UTF8, "text/plain",
95 "text/plain",
96 GNUNET_FS_DIRECTORY_MIME, 94 GNUNET_FS_DIRECTORY_MIME,
97 strlen (GNUNET_FS_DIRECTORY_MIME) + 1); 95 strlen (GNUNET_FS_DIRECTORY_MIME) + 1);
98} 96}
@@ -134,10 +132,8 @@ struct GetFullDataClosure
134 * @return 0 to continue extracting, 1 to abort 132 * @return 0 to continue extracting, 1 to abort
135 */ 133 */
136static int 134static int
137find_full_data (void *cls, 135find_full_data (void *cls, const char *plugin_name,
138 const char *plugin_name, 136 enum EXTRACTOR_MetaType type, enum EXTRACTOR_MetaFormat format,
139 enum EXTRACTOR_MetaType type,
140 enum EXTRACTOR_MetaFormat format,
141 const char *data_mime_type, const char *data, size_t data_len) 137 const char *data_mime_type, const char *data, size_t data_len)
142{ 138{
143 struct GetFullDataClosure *gfdc = cls; 139 struct GetFullDataClosure *gfdc = cls;
@@ -182,8 +178,7 @@ find_full_data (void *cls,
182 * GNUNET_SYSERR if 'data' does not represent a directory 178 * GNUNET_SYSERR if 'data' does not represent a directory
183 */ 179 */
184int 180int
185GNUNET_FS_directory_list_contents (size_t size, 181GNUNET_FS_directory_list_contents (size_t size, const void *data,
186 const void *data,
187 uint64_t offset, 182 uint64_t offset,
188 GNUNET_FS_DirectoryEntryProcessor dep, 183 GNUNET_FS_DirectoryEntryProcessor dep,
189 void *dep_cls) 184 void *dep_cls)
@@ -219,8 +214,7 @@ GNUNET_FS_directory_list_contents (size_t size,
219 _("MAGIC mismatch. This is not a GNUnet directory.\n")); 214 _("MAGIC mismatch. This is not a GNUnet directory.\n"));
220 return GNUNET_SYSERR; 215 return GNUNET_SYSERR;
221 } 216 }
222 md = GNUNET_CONTAINER_meta_data_deserialize (&cdata[8 + 217 md = GNUNET_CONTAINER_meta_data_deserialize (&cdata[8 + sizeof (uint32_t)],
223 sizeof (uint32_t)],
224 mdSize); 218 mdSize);
225 if (md == NULL) 219 if (md == NULL)
226 { 220 {
@@ -289,8 +283,9 @@ GNUNET_FS_directory_list_contents (size_t size,
289 return GNUNET_NO; /* malformed ! */ 283 return GNUNET_NO; /* malformed ! */
290 } 284 }
291 pos += mdSize; 285 pos += mdSize;
292 filename = GNUNET_CONTAINER_meta_data_get_by_type (md, 286 filename =
293 EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); 287 GNUNET_CONTAINER_meta_data_get_by_type (md,
288 EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
294 full_data.size = 0; 289 full_data.size = 0;
295 full_data.data = NULL; 290 full_data.data = NULL;
296 GNUNET_CONTAINER_meta_data_iterate (md, &find_full_data, &full_data); 291 GNUNET_CONTAINER_meta_data_iterate (md, &find_full_data, &full_data);
@@ -425,11 +420,10 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
425 if (fsize > 0) 420 if (fsize > 0)
426 { 421 {
427 meta = GNUNET_CONTAINER_meta_data_duplicate (md); 422 meta = GNUNET_CONTAINER_meta_data_duplicate (md);
428 GNUNET_CONTAINER_meta_data_insert (meta, 423 GNUNET_CONTAINER_meta_data_insert (meta, "<gnunet>",
429 "<gnunet>",
430 EXTRACTOR_METATYPE_GNUNET_FULL_DATA, 424 EXTRACTOR_METATYPE_GNUNET_FULL_DATA,
431 EXTRACTOR_METAFORMAT_BINARY, 425 EXTRACTOR_METAFORMAT_BINARY, NULL, data,
432 NULL, data, fsize); 426 fsize);
433 mdxs = GNUNET_CONTAINER_meta_data_get_serialized_size (meta); 427 mdxs = GNUNET_CONTAINER_meta_data_get_serialized_size (meta);
434 if ((slen + sizeof (uint32_t) + mdxs - 1) / DBLOCK_SIZE == 428 if ((slen + sizeof (uint32_t) + mdxs - 1) / DBLOCK_SIZE ==
435 (slen + sizeof (uint32_t) + mds - 1) / DBLOCK_SIZE) 429 (slen + sizeof (uint32_t) + mds - 1) / DBLOCK_SIZE)
@@ -443,16 +437,15 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
443 437
444 if (mds > GNUNET_MAX_MALLOC_CHECKED / 2) 438 if (mds > GNUNET_MAX_MALLOC_CHECKED / 2)
445 mds = GNUNET_MAX_MALLOC_CHECKED / 2; 439 mds = GNUNET_MAX_MALLOC_CHECKED / 2;
446 e = GNUNET_malloc (sizeof (struct BuilderEntry) + 440 e = GNUNET_malloc (sizeof (struct BuilderEntry) + slen + mds +
447 slen + mds + sizeof (uint32_t)); 441 sizeof (uint32_t));
448 ser = (char *) &e[1]; 442 ser = (char *) &e[1];
449 memcpy (ser, uris, slen); 443 memcpy (ser, uris, slen);
450 GNUNET_free (uris); 444 GNUNET_free (uris);
451 sptr = &ser[slen + sizeof (uint32_t)]; 445 sptr = &ser[slen + sizeof (uint32_t)];
452 ret = GNUNET_CONTAINER_meta_data_serialize (meta_use, 446 ret =
453 &sptr, 447 GNUNET_CONTAINER_meta_data_serialize (meta_use, &sptr, mds,
454 mds, 448 GNUNET_CONTAINER_META_DATA_SERIALIZE_PART);
455 GNUNET_CONTAINER_META_DATA_SERIALIZE_PART);
456 if (NULL != meta) 449 if (NULL != meta)
457 GNUNET_CONTAINER_meta_data_destroy (meta); 450 GNUNET_CONTAINER_meta_data_destroy (meta);
458 if (ret == -1) 451 if (ret == -1)
@@ -495,8 +488,8 @@ do_align (size_t start_position, size_t end_position)
495 * @param perm the permutation of the blocks (updated) 488 * @param perm the permutation of the blocks (updated)
496 */ 489 */
497static void 490static void
498block_align (size_t start, 491block_align (size_t start, unsigned int count, const size_t * sizes,
499 unsigned int count, const size_t * sizes, unsigned int *perm) 492 unsigned int *perm)
500{ 493{
501 unsigned int i; 494 unsigned int i;
502 unsigned int j; 495 unsigned int j;
@@ -625,10 +618,10 @@ GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
625 off = strlen (GNUNET_DIRECTORY_MAGIC); 618 off = strlen (GNUNET_DIRECTORY_MAGIC);
626 619
627 sptr = &data[off + sizeof (uint32_t)]; 620 sptr = &data[off + sizeof (uint32_t)];
628 ret = GNUNET_CONTAINER_meta_data_serialize (bld->meta, 621 ret =
629 &sptr, 622 GNUNET_CONTAINER_meta_data_serialize (bld->meta, &sptr,
630 size - off - sizeof (uint32_t), 623 size - off - sizeof (uint32_t),
631 GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL); 624 GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL);
632 GNUNET_assert (ret != -1); 625 GNUNET_assert (ret != -1);
633 big = htonl (ret); 626 big = htonl (ret);
634 memcpy (&data[off], &big, sizeof (uint32_t)); 627 memcpy (&data[off], &big, sizeof (uint32_t));