aboutsummaryrefslogtreecommitdiff
path: root/src/fs/fs_directory.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/fs/fs_directory.c')
-rw-r--r--src/fs/fs_directory.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c
index f29b0eff5..a18a903be 100644
--- a/src/fs/fs_directory.c
+++ b/src/fs/fs_directory.c
@@ -142,7 +142,7 @@ find_full_data (void *cls, const char *plugin_name,
142 if (data_len > 0) 142 if (data_len > 0)
143 { 143 {
144 gfdc->data = GNUNET_malloc (data_len); 144 gfdc->data = GNUNET_malloc (data_len);
145 memcpy (gfdc->data, data, data_len); 145 GNUNET_memcpy (gfdc->data, data, data_len);
146 } 146 }
147 return 1; 147 return 1;
148 } 148 }
@@ -199,7 +199,7 @@ GNUNET_FS_directory_list_contents (size_t size, const void *data,
199 pos = offset; 199 pos = offset;
200 if (offset == 0) 200 if (offset == 0)
201 { 201 {
202 memcpy (&mdSize, &cdata[8], sizeof (uint32_t)); 202 GNUNET_memcpy (&mdSize, &cdata[8], sizeof (uint32_t));
203 mdSize = ntohl (mdSize); 203 mdSize = ntohl (mdSize);
204 if (mdSize > size - 8 - sizeof (uint32_t)) 204 if (mdSize > size - 8 - sizeof (uint32_t))
205 { 205 {
@@ -260,7 +260,7 @@ GNUNET_FS_directory_list_contents (size_t size, const void *data,
260 return GNUNET_NO; /* illegal in directory! */ 260 return GNUNET_NO; /* illegal in directory! */
261 } 261 }
262 262
263 memcpy (&mdSize, &cdata[pos], sizeof (uint32_t)); 263 GNUNET_memcpy (&mdSize, &cdata[pos], sizeof (uint32_t));
264 mdSize = ntohl (mdSize); 264 mdSize = ntohl (mdSize);
265 pos += sizeof (uint32_t); 265 pos += sizeof (uint32_t);
266 if (pos + mdSize > size) 266 if (pos + mdSize > size)
@@ -434,7 +434,7 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
434 e = GNUNET_malloc (sizeof (struct BuilderEntry) + slen + mds + 434 e = GNUNET_malloc (sizeof (struct BuilderEntry) + slen + mds +
435 sizeof (uint32_t)); 435 sizeof (uint32_t));
436 ser = (char *) &e[1]; 436 ser = (char *) &e[1];
437 memcpy (ser, uris, slen); 437 GNUNET_memcpy (ser, uris, slen);
438 GNUNET_free (uris); 438 GNUNET_free (uris);
439 sptr = &ser[slen + sizeof (uint32_t)]; 439 sptr = &ser[slen + sizeof (uint32_t)];
440 ret = 440 ret =
@@ -447,7 +447,7 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
447 else 447 else
448 mds = ret; 448 mds = ret;
449 big = htonl (mds); 449 big = htonl (mds);
450 memcpy (&ser[slen], &big, sizeof (uint32_t)); 450 GNUNET_memcpy (&ser[slen], &big, sizeof (uint32_t));
451 e->len = slen + sizeof (uint32_t) + mds; 451 e->len = slen + sizeof (uint32_t) + mds;
452 e->next = bld->head; 452 e->next = bld->head;
453 bld->head = e; 453 bld->head = e;
@@ -608,7 +608,7 @@ GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
608 return GNUNET_SYSERR; 608 return GNUNET_SYSERR;
609 } 609 }
610 *rdata = data; 610 *rdata = data;
611 memcpy (data, GNUNET_DIRECTORY_MAGIC, strlen (GNUNET_DIRECTORY_MAGIC)); 611 GNUNET_memcpy (data, GNUNET_DIRECTORY_MAGIC, strlen (GNUNET_DIRECTORY_MAGIC));
612 off = strlen (GNUNET_DIRECTORY_MAGIC); 612 off = strlen (GNUNET_DIRECTORY_MAGIC);
613 613
614 sptr = &data[off + sizeof (uint32_t)]; 614 sptr = &data[off + sizeof (uint32_t)];
@@ -618,7 +618,7 @@ GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
618 GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL); 618 GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL);
619 GNUNET_assert (ret != -1); 619 GNUNET_assert (ret != -1);
620 big = htonl (ret); 620 big = htonl (ret);
621 memcpy (&data[off], &big, sizeof (uint32_t)); 621 GNUNET_memcpy (&data[off], &big, sizeof (uint32_t));
622 off += sizeof (uint32_t) + ret; 622 off += sizeof (uint32_t) + ret;
623 for (j = 0; j < bld->count; j++) 623 for (j = 0; j < bld->count; j++)
624 { 624 {
@@ -626,7 +626,7 @@ GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
626 psize = off; 626 psize = off;
627 off += sizes[i]; 627 off += sizes[i];
628 off = do_align (psize, off); 628 off = do_align (psize, off);
629 memcpy (&data[off - sizes[i]], &(bes[i])[1], sizes[i]); 629 GNUNET_memcpy (&data[off - sizes[i]], &(bes[i])[1], sizes[i]);
630 GNUNET_free (bes[i]); 630 GNUNET_free (bes[i]);
631 } 631 }
632 GNUNET_free_non_null (sizes); 632 GNUNET_free_non_null (sizes);