diff options
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/fs_api.c | 2 | ||||
-rw-r--r-- | src/fs/fs_directory.c | 16 | ||||
-rw-r--r-- | src/fs/fs_getopt.c | 4 | ||||
-rw-r--r-- | src/fs/fs_publish.c | 4 | ||||
-rw-r--r-- | src/fs/fs_publish_ublock.c | 4 | ||||
-rw-r--r-- | src/fs/fs_sharetree.c | 2 | ||||
-rw-r--r-- | src/fs/fs_uri.c | 12 | ||||
-rw-r--r-- | src/fs/gnunet-daemon-fsprofiler.c | 2 | ||||
-rw-r--r-- | src/fs/gnunet-helper-fs-publish.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_cadet_client.c | 2 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_cadet_server.c | 5 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_cp.c | 6 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_indexing.c | 6 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_lc.c | 6 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_pr.c | 10 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_push.c | 6 |
16 files changed, 46 insertions, 45 deletions
diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c index 7ebcd093e..1e8af23c5 100644 --- a/src/fs/fs_api.c +++ b/src/fs/fs_api.c | |||
@@ -581,7 +581,7 @@ GNUNET_FS_data_reader_copy_ (void *cls, | |||
581 | GNUNET_free_non_null (data); | 581 | GNUNET_free_non_null (data); |
582 | return 0; | 582 | return 0; |
583 | } | 583 | } |
584 | memcpy (buf, &data[offset], max); | 584 | GNUNET_memcpy (buf, &data[offset], max); |
585 | return max; | 585 | return max; |
586 | } | 586 | } |
587 | 587 | ||
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); |
diff --git a/src/fs/fs_getopt.c b/src/fs/fs_getopt.c index 8657c62de..f78e311d3 100644 --- a/src/fs/fs_getopt.c +++ b/src/fs/fs_getopt.c | |||
@@ -76,7 +76,7 @@ GNUNET_FS_getopt_set_keywords (struct GNUNET_GETOPT_CommandLineProcessorContext | |||
76 | /* remove the quotes, keep the '+' */ | 76 | /* remove the quotes, keep the '+' */ |
77 | val = GNUNET_malloc (slen - 1); | 77 | val = GNUNET_malloc (slen - 1); |
78 | val[0] = '+'; | 78 | val[0] = '+'; |
79 | memcpy (&val[1], &value[2], slen - 3); | 79 | GNUNET_memcpy (&val[1], &value[2], slen - 3); |
80 | val[slen - 2] = '\0'; | 80 | val[slen - 2] = '\0'; |
81 | } | 81 | } |
82 | else | 82 | else |
@@ -92,7 +92,7 @@ GNUNET_FS_getopt_set_keywords (struct GNUNET_GETOPT_CommandLineProcessorContext | |||
92 | /* remove the quotes, add a space */ | 92 | /* remove the quotes, add a space */ |
93 | val = GNUNET_malloc (slen); | 93 | val = GNUNET_malloc (slen); |
94 | val[0] = ' '; | 94 | val[0] = ' '; |
95 | memcpy (&val[1], &value[1], slen - 2); | 95 | GNUNET_memcpy (&val[1], &value[1], slen - 2); |
96 | val[slen - 1] = '\0'; | 96 | val[slen - 1] = '\0'; |
97 | } | 97 | } |
98 | else | 98 | else |
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index 7cf8b4815..01305d678 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c | |||
@@ -380,7 +380,7 @@ block_reader (void *cls, | |||
380 | { | 380 | { |
381 | pt_size = GNUNET_MIN (max, p->data.dir.dir_size - offset); | 381 | pt_size = GNUNET_MIN (max, p->data.dir.dir_size - offset); |
382 | dd = p->data.dir.dir_data; | 382 | dd = p->data.dir.dir_data; |
383 | memcpy (buf, &dd[offset], pt_size); | 383 | GNUNET_memcpy (buf, &dd[offset], pt_size); |
384 | } | 384 | } |
385 | else | 385 | else |
386 | { | 386 | { |
@@ -903,7 +903,7 @@ hash_for_index_cb (void *cls, | |||
903 | p->filename); | 903 | p->filename); |
904 | } | 904 | } |
905 | ism->file_id = *res; | 905 | ism->file_id = *res; |
906 | memcpy (&ism[1], | 906 | GNUNET_memcpy (&ism[1], |
907 | fn, | 907 | fn, |
908 | slen); | 908 | slen); |
909 | GNUNET_free (fn); | 909 | GNUNET_free (fn); |
diff --git a/src/fs/fs_publish_ublock.c b/src/fs/fs_publish_ublock.c index 7de9ea689..e21443ccb 100644 --- a/src/fs/fs_publish_ublock.c +++ b/src/fs/fs_publish_ublock.c | |||
@@ -224,9 +224,9 @@ GNUNET_FS_publish_ublock_ (struct GNUNET_FS_Handle *h, | |||
224 | ub_plain = GNUNET_malloc (size); | 224 | ub_plain = GNUNET_malloc (size); |
225 | kbe = (char *) &ub_plain[1]; | 225 | kbe = (char *) &ub_plain[1]; |
226 | if (NULL != ulabel) | 226 | if (NULL != ulabel) |
227 | memcpy (kbe, ulabel, ulen); | 227 | GNUNET_memcpy (kbe, ulabel, ulen); |
228 | kbe += ulen; | 228 | kbe += ulen; |
229 | memcpy (kbe, uris, slen); | 229 | GNUNET_memcpy (kbe, uris, slen); |
230 | kbe += slen; | 230 | kbe += slen; |
231 | GNUNET_free (uris); | 231 | GNUNET_free (uris); |
232 | sptr = kbe; | 232 | sptr = kbe; |
diff --git a/src/fs/fs_sharetree.c b/src/fs/fs_sharetree.c index 14beae5c8..906e78dd3 100644 --- a/src/fs/fs_sharetree.c +++ b/src/fs/fs_sharetree.c | |||
@@ -172,7 +172,7 @@ add_to_keyword_counter (void *cls, const char *keyword, int is_mandatory) | |||
172 | { | 172 | { |
173 | cnt = GNUNET_malloc (sizeof (struct KeywordCounter) + klen); | 173 | cnt = GNUNET_malloc (sizeof (struct KeywordCounter) + klen); |
174 | cnt->value = (const char *) &cnt[1]; | 174 | cnt->value = (const char *) &cnt[1]; |
175 | memcpy (&cnt[1], keyword, klen); | 175 | GNUNET_memcpy (&cnt[1], keyword, klen); |
176 | GNUNET_assert (GNUNET_OK == | 176 | GNUNET_assert (GNUNET_OK == |
177 | GNUNET_CONTAINER_multihashmap_put (mcm, | 177 | GNUNET_CONTAINER_multihashmap_put (mcm, |
178 | &hc, cnt, | 178 | &hc, cnt, |
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c index 12cae6b64..fa27e6e9b 100644 --- a/src/fs/fs_uri.c +++ b/src/fs/fs_uri.c | |||
@@ -417,9 +417,9 @@ uri_chk_parse (const char *s, | |||
417 | *emsg = GNUNET_strdup (_("Malformed CHK URI (wrong syntax)")); | 417 | *emsg = GNUNET_strdup (_("Malformed CHK URI (wrong syntax)")); |
418 | return NULL; | 418 | return NULL; |
419 | } | 419 | } |
420 | memcpy (h1, &s[pos], sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)); | 420 | GNUNET_memcpy (h1, &s[pos], sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)); |
421 | h1[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] = '\0'; | 421 | h1[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] = '\0'; |
422 | memcpy (h2, &s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)], | 422 | GNUNET_memcpy (h2, &s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)], |
423 | sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)); | 423 | sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)); |
424 | h2[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] = '\0'; | 424 | h2[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] = '\0'; |
425 | 425 | ||
@@ -511,9 +511,9 @@ uri_loc_parse (const char *s, | |||
511 | *emsg = GNUNET_strdup (_("LOC URI malformed (wrong syntax)")); | 511 | *emsg = GNUNET_strdup (_("LOC URI malformed (wrong syntax)")); |
512 | return NULL; | 512 | return NULL; |
513 | } | 513 | } |
514 | memcpy (h1, &s[pos], sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)); | 514 | GNUNET_memcpy (h1, &s[pos], sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)); |
515 | h1[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] = '\0'; | 515 | h1[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] = '\0'; |
516 | memcpy (h2, &s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)], | 516 | GNUNET_memcpy (h2, &s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)], |
517 | sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)); | 517 | sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)); |
518 | h2[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] = '\0'; | 518 | h2[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] = '\0'; |
519 | 519 | ||
@@ -978,7 +978,7 @@ GNUNET_FS_uri_dup (const struct GNUNET_FS_Uri *uri) | |||
978 | if (uri == NULL) | 978 | if (uri == NULL) |
979 | return NULL; | 979 | return NULL; |
980 | ret = GNUNET_new (struct GNUNET_FS_Uri); | 980 | ret = GNUNET_new (struct GNUNET_FS_Uri); |
981 | memcpy (ret, uri, sizeof (struct GNUNET_FS_Uri)); | 981 | GNUNET_memcpy (ret, uri, sizeof (struct GNUNET_FS_Uri)); |
982 | switch (ret->type) | 982 | switch (ret->type) |
983 | { | 983 | { |
984 | case GNUNET_FS_URI_KSK: | 984 | case GNUNET_FS_URI_KSK: |
@@ -1450,7 +1450,7 @@ normalize_metadata (enum EXTRACTOR_MetaFormat format, | |||
1450 | { | 1450 | { |
1451 | /* u8_tolower allocates a non-NULL-terminated string! */ | 1451 | /* u8_tolower allocates a non-NULL-terminated string! */ |
1452 | free_str = GNUNET_malloc (r_len + 1); | 1452 | free_str = GNUNET_malloc (r_len + 1); |
1453 | memcpy (free_str, normalized, r_len); | 1453 | GNUNET_memcpy (free_str, normalized, r_len); |
1454 | free_str[r_len] = '\0'; | 1454 | free_str[r_len] = '\0'; |
1455 | free (normalized); | 1455 | free (normalized); |
1456 | normalized = free_str; | 1456 | normalized = free_str; |
diff --git a/src/fs/gnunet-daemon-fsprofiler.c b/src/fs/gnunet-daemon-fsprofiler.c index e6bc33e10..b9171c42d 100644 --- a/src/fs/gnunet-daemon-fsprofiler.c +++ b/src/fs/gnunet-daemon-fsprofiler.c | |||
@@ -246,7 +246,7 @@ make_file (uint64_t length, | |||
246 | for (i=0;i<length; i+=8) | 246 | for (i=0;i<length; i+=8) |
247 | { | 247 | { |
248 | xor = length ^ kval ^ (uint64_t) (i / 32 / 1024); | 248 | xor = length ^ kval ^ (uint64_t) (i / 32 / 1024); |
249 | memcpy (&data[i], &xor, GNUNET_MIN (length - i, sizeof (uint64_t))); | 249 | GNUNET_memcpy (&data[i], &xor, GNUNET_MIN (length - i, sizeof (uint64_t))); |
250 | } | 250 | } |
251 | bo.expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_DAYS); | 251 | bo.expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_DAYS); |
252 | bo.anonymity_level = (uint32_t) anonymity_level; | 252 | bo.anonymity_level = (uint32_t) anonymity_level; |
diff --git a/src/fs/gnunet-helper-fs-publish.c b/src/fs/gnunet-helper-fs-publish.c index 58f76a0d8..55836e772 100644 --- a/src/fs/gnunet-helper-fs-publish.c +++ b/src/fs/gnunet-helper-fs-publish.c | |||
@@ -129,7 +129,7 @@ add_to_md (void *cls, | |||
129 | ('\0' != data[data_len - 1]) ) | 129 | ('\0' != data[data_len - 1]) ) |
130 | { | 130 | { |
131 | char zdata[data_len + 1]; | 131 | char zdata[data_len + 1]; |
132 | memcpy (zdata, data, data_len); | 132 | GNUNET_memcpy (zdata, data, data_len); |
133 | zdata[data_len] = '\0'; | 133 | zdata[data_len] = '\0'; |
134 | (void) GNUNET_CONTAINER_meta_data_insert (md, plugin_name, type, format, | 134 | (void) GNUNET_CONTAINER_meta_data_insert (md, plugin_name, type, format, |
135 | data_mime_type, zdata, data_len + 1); | 135 | data_mime_type, zdata, data_len + 1); |
@@ -419,7 +419,7 @@ extract_files (struct ScanTreeNode *item) | |||
419 | char buf[size + slen]; | 419 | char buf[size + slen]; |
420 | char *dst = &buf[slen]; | 420 | char *dst = &buf[slen]; |
421 | 421 | ||
422 | memcpy (buf, item->filename, slen); | 422 | GNUNET_memcpy (buf, item->filename, slen); |
423 | size = GNUNET_CONTAINER_meta_data_serialize (meta, | 423 | size = GNUNET_CONTAINER_meta_data_serialize (meta, |
424 | &dst, size, | 424 | &dst, size, |
425 | GNUNET_CONTAINER_META_DATA_SERIALIZE_PART); | 425 | GNUNET_CONTAINER_META_DATA_SERIALIZE_PART); |
diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/fs/gnunet-service-fs_cadet_client.c index 3ea2efa67..90a0c3b7f 100644 --- a/src/fs/gnunet-service-fs_cadet_client.c +++ b/src/fs/gnunet-service-fs_cadet_client.c | |||
@@ -343,7 +343,7 @@ transmit_sqm (void *cls, | |||
343 | sqm.header.type = htons (GNUNET_MESSAGE_TYPE_FS_CADET_QUERY); | 343 | sqm.header.type = htons (GNUNET_MESSAGE_TYPE_FS_CADET_QUERY); |
344 | sqm.type = htonl (sr->type); | 344 | sqm.type = htonl (sr->type); |
345 | sqm.query = sr->query; | 345 | sqm.query = sr->query; |
346 | memcpy (buf, &sqm, sizeof (sqm)); | 346 | GNUNET_memcpy (buf, &sqm, sizeof (sqm)); |
347 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 347 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
348 | "Successfully transmitted %u bytes via cadet to %s\n", | 348 | "Successfully transmitted %u bytes via cadet to %s\n", |
349 | (unsigned int) size, | 349 | (unsigned int) size, |
diff --git a/src/fs/gnunet-service-fs_cadet_server.c b/src/fs/gnunet-service-fs_cadet_server.c index c9d838fef..b1de0bb6c 100644 --- a/src/fs/gnunet-service-fs_cadet_server.c +++ b/src/fs/gnunet-service-fs_cadet_server.c | |||
@@ -257,7 +257,8 @@ write_continuation (void *cls, | |||
257 | GNUNET_STATISTICS_update (GSF_stats, | 257 | GNUNET_STATISTICS_update (GSF_stats, |
258 | gettext_noop ("# Blocks transferred via cadet"), 1, | 258 | gettext_noop ("# Blocks transferred via cadet"), 1, |
259 | GNUNET_NO); | 259 | GNUNET_NO); |
260 | memcpy (buf, &wqi[1], ret = wqi->msize); | 260 | GNUNET_memcpy (buf, &wqi[1], ret); |
261 | ret = wqi->msize; | ||
261 | GNUNET_free (wqi); | 262 | GNUNET_free (wqi); |
262 | continue_writing (sc); | 263 | continue_writing (sc); |
263 | return ret; | 264 | return ret; |
@@ -400,7 +401,7 @@ handle_datastore_reply (void *cls, | |||
400 | srm->header.type = htons (GNUNET_MESSAGE_TYPE_FS_CADET_REPLY); | 401 | srm->header.type = htons (GNUNET_MESSAGE_TYPE_FS_CADET_REPLY); |
401 | srm->type = htonl (type); | 402 | srm->type = htonl (type); |
402 | srm->expiration = GNUNET_TIME_absolute_hton (expiration); | 403 | srm->expiration = GNUNET_TIME_absolute_hton (expiration); |
403 | memcpy (&srm[1], data, size); | 404 | GNUNET_memcpy (&srm[1], data, size); |
404 | sc->reply_size = msize; | 405 | sc->reply_size = msize; |
405 | GNUNET_CONTAINER_DLL_insert (sc->wqi_head, | 406 | GNUNET_CONTAINER_DLL_insert (sc->wqi_head, |
406 | sc->wqi_tail, | 407 | sc->wqi_tail, |
diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c index ceb74a271..bda33d766 100644 --- a/src/fs/gnunet-service-fs_cp.c +++ b/src/fs/gnunet-service-fs_cp.c | |||
@@ -780,7 +780,7 @@ copy_reply (void *cls, | |||
780 | { | 780 | { |
781 | GNUNET_assert (buf_size >= ntohs (pm->header.size)); | 781 | GNUNET_assert (buf_size >= ntohs (pm->header.size)); |
782 | size = ntohs (pm->header.size); | 782 | size = ntohs (pm->header.size); |
783 | memcpy (buf, pm, size); | 783 | GNUNET_memcpy (buf, pm, size); |
784 | GNUNET_STATISTICS_update (GSF_stats, | 784 | GNUNET_STATISTICS_update (GSF_stats, |
785 | gettext_noop ("# replies transmitted to other peers"), | 785 | gettext_noop ("# replies transmitted to other peers"), |
786 | 1, | 786 | 1, |
@@ -1005,7 +1005,7 @@ handle_p2p_reply (void *cls, | |||
1005 | pm->header.size = htons (msize); | 1005 | pm->header.size = htons (msize); |
1006 | pm->type = htonl (type); | 1006 | pm->type = htonl (type); |
1007 | pm->expiration = GNUNET_TIME_absolute_hton (expiration); | 1007 | pm->expiration = GNUNET_TIME_absolute_hton (expiration); |
1008 | memcpy (&pm[1], data, data_len); | 1008 | GNUNET_memcpy (&pm[1], data, data_len); |
1009 | if ( (UINT32_MAX != reply_anonymity_level) && | 1009 | if ( (UINT32_MAX != reply_anonymity_level) && |
1010 | (0 != reply_anonymity_level) && | 1010 | (0 != reply_anonymity_level) && |
1011 | (GNUNET_YES == GSF_enable_randomized_delays) ) | 1011 | (GNUNET_YES == GSF_enable_randomized_delays) ) |
@@ -1908,7 +1908,7 @@ create_migration_stop_message (void *cls, | |||
1908 | msm.duration = | 1908 | msm.duration = |
1909 | GNUNET_TIME_relative_hton (GNUNET_TIME_absolute_get_remaining | 1909 | GNUNET_TIME_relative_hton (GNUNET_TIME_absolute_get_remaining |
1910 | (cp->last_migration_block)); | 1910 | (cp->last_migration_block)); |
1911 | memcpy (buf, &msm, sizeof (struct MigrationStopMessage)); | 1911 | GNUNET_memcpy (buf, &msm, sizeof (struct MigrationStopMessage)); |
1912 | GNUNET_STATISTICS_update (GSF_stats, | 1912 | GNUNET_STATISTICS_update (GSF_stats, |
1913 | gettext_noop ("# migration stop messages sent"), | 1913 | gettext_noop ("# migration stop messages sent"), |
1914 | 1, GNUNET_NO); | 1914 | 1, GNUNET_NO); |
diff --git a/src/fs/gnunet-service-fs_indexing.c b/src/fs/gnunet-service-fs_indexing.c index 87de0986d..385c88fe2 100644 --- a/src/fs/gnunet-service-fs_indexing.c +++ b/src/fs/gnunet-service-fs_indexing.c | |||
@@ -193,7 +193,7 @@ read_index_list () | |||
193 | pos = GNUNET_malloc (sizeof (struct IndexInfo) + slen); | 193 | pos = GNUNET_malloc (sizeof (struct IndexInfo) + slen); |
194 | pos->file_id = hc; | 194 | pos->file_id = hc; |
195 | pos->filename = (const char *) &pos[1]; | 195 | pos->filename = (const char *) &pos[1]; |
196 | memcpy (&pos[1], fname, slen); | 196 | GNUNET_memcpy (&pos[1], fname, slen); |
197 | if (GNUNET_SYSERR == | 197 | if (GNUNET_SYSERR == |
198 | GNUNET_CONTAINER_multihashmap_put (ifm, &pos->file_id, pos, | 198 | GNUNET_CONTAINER_multihashmap_put (ifm, &pos->file_id, pos, |
199 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)) | 199 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)) |
@@ -334,7 +334,7 @@ GNUNET_FS_handle_index_start (void *cls, struct GNUNET_SERVER_Client *client, | |||
334 | slen = strlen (fn) + 1; | 334 | slen = strlen (fn) + 1; |
335 | ii = GNUNET_malloc (sizeof (struct IndexInfo) + slen); | 335 | ii = GNUNET_malloc (sizeof (struct IndexInfo) + slen); |
336 | ii->filename = (const char *) &ii[1]; | 336 | ii->filename = (const char *) &ii[1]; |
337 | memcpy (&ii[1], fn, slen); | 337 | GNUNET_memcpy (&ii[1], fn, slen); |
338 | ii->file_id = ism->file_id; | 338 | ii->file_id = ism->file_id; |
339 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message for file `%s'\n", | 339 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message for file `%s'\n", |
340 | "START_INDEX", ii->filename); | 340 | "START_INDEX", ii->filename); |
@@ -398,7 +398,7 @@ GNUNET_FS_handle_index_list_get (void *cls, struct GNUNET_SERVER_Client *client, | |||
398 | iim->header.size = htons (slen + sizeof (struct IndexInfoMessage)); | 398 | iim->header.size = htons (slen + sizeof (struct IndexInfoMessage)); |
399 | iim->reserved = 0; | 399 | iim->reserved = 0; |
400 | iim->file_id = pos->file_id; | 400 | iim->file_id = pos->file_id; |
401 | memcpy (&iim[1], fn, slen); | 401 | GNUNET_memcpy (&iim[1], fn, slen); |
402 | GNUNET_SERVER_transmit_context_append_message (tc, &iim->header); | 402 | GNUNET_SERVER_transmit_context_append_message (tc, &iim->header); |
403 | } | 403 | } |
404 | GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0, | 404 | GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0, |
diff --git a/src/fs/gnunet-service-fs_lc.c b/src/fs/gnunet-service-fs_lc.c index e61442aa3..4526c65db 100644 --- a/src/fs/gnunet-service-fs_lc.c +++ b/src/fs/gnunet-service-fs_lc.c | |||
@@ -274,7 +274,7 @@ client_response_handler (void *cls, | |||
274 | pm->last_transmission = GNUNET_TIME_absolute_hton (last_transmission); | 274 | pm->last_transmission = GNUNET_TIME_absolute_hton (last_transmission); |
275 | pm->num_transmissions = htonl (prd->num_transmissions); | 275 | pm->num_transmissions = htonl (prd->num_transmissions); |
276 | pm->respect_offered = htonl (prd->respect_offered); | 276 | pm->respect_offered = htonl (prd->respect_offered); |
277 | memcpy (&pm[1], data, data_len); | 277 | GNUNET_memcpy (&pm[1], data, data_len); |
278 | GSF_local_client_transmit_ (lc, &pm->header); | 278 | GSF_local_client_transmit_ (lc, &pm->header); |
279 | } | 279 | } |
280 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 280 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -436,7 +436,7 @@ transmit_to_client (void *cls, | |||
436 | msize = 0; | 436 | msize = 0; |
437 | while ((NULL != (res = lc->res_head)) && (res->msize <= size)) | 437 | while ((NULL != (res = lc->res_head)) && (res->msize <= size)) |
438 | { | 438 | { |
439 | memcpy (&cbuf[msize], &res[1], res->msize); | 439 | GNUNET_memcpy (&cbuf[msize], &res[1], res->msize); |
440 | msize += res->msize; | 440 | msize += res->msize; |
441 | size -= res->msize; | 441 | size -= res->msize; |
442 | GNUNET_CONTAINER_DLL_remove (lc->res_head, lc->res_tail, res); | 442 | GNUNET_CONTAINER_DLL_remove (lc->res_head, lc->res_tail, res); |
@@ -470,7 +470,7 @@ GSF_local_client_transmit_ (struct GSF_LocalClient *lc, | |||
470 | res = GNUNET_malloc (sizeof (struct ClientResponse) + msize); | 470 | res = GNUNET_malloc (sizeof (struct ClientResponse) + msize); |
471 | res->lc = lc; | 471 | res->lc = lc; |
472 | res->msize = msize; | 472 | res->msize = msize; |
473 | memcpy (&res[1], | 473 | GNUNET_memcpy (&res[1], |
474 | msg, | 474 | msg, |
475 | msize); | 475 | msize); |
476 | GNUNET_CONTAINER_DLL_insert_tail (lc->res_head, | 476 | GNUNET_CONTAINER_DLL_insert_tail (lc->res_head, |
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index d82b2a954..cd58992c1 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c | |||
@@ -326,7 +326,7 @@ GSF_pending_request_create_ (enum GSF_PendingRequestOptions options, | |||
326 | if (NULL != target) | 326 | if (NULL != target) |
327 | { | 327 | { |
328 | pr->public_data.target = (struct GNUNET_PeerIdentity *) eptr; | 328 | pr->public_data.target = (struct GNUNET_PeerIdentity *) eptr; |
329 | memcpy (eptr, | 329 | GNUNET_memcpy (eptr, |
330 | target, | 330 | target, |
331 | sizeof (struct GNUNET_PeerIdentity)); | 331 | sizeof (struct GNUNET_PeerIdentity)); |
332 | } | 332 | } |
@@ -357,7 +357,7 @@ GSF_pending_request_create_ (enum GSF_PendingRequestOptions options, | |||
357 | pr->replies_seen_size = replies_seen_count; | 357 | pr->replies_seen_size = replies_seen_count; |
358 | pr->replies_seen = | 358 | pr->replies_seen = |
359 | GNUNET_malloc (sizeof (struct GNUNET_HashCode) * pr->replies_seen_size); | 359 | GNUNET_malloc (sizeof (struct GNUNET_HashCode) * pr->replies_seen_size); |
360 | memcpy (pr->replies_seen, | 360 | GNUNET_memcpy (pr->replies_seen, |
361 | replies_seen, | 361 | replies_seen, |
362 | replies_seen_count * sizeof (struct GNUNET_HashCode)); | 362 | replies_seen_count * sizeof (struct GNUNET_HashCode)); |
363 | pr->replies_seen_count = replies_seen_count; | 363 | pr->replies_seen_count = replies_seen_count; |
@@ -472,7 +472,7 @@ GSF_pending_request_update_ (struct GSF_PendingRequest *pr, | |||
472 | if (replies_seen_count + pr->replies_seen_count > pr->replies_seen_size) | 472 | if (replies_seen_count + pr->replies_seen_count > pr->replies_seen_size) |
473 | GNUNET_array_grow (pr->replies_seen, pr->replies_seen_size, | 473 | GNUNET_array_grow (pr->replies_seen, pr->replies_seen_size, |
474 | replies_seen_count + pr->replies_seen_count); | 474 | replies_seen_count + pr->replies_seen_count); |
475 | memcpy (&pr->replies_seen[pr->replies_seen_count], replies_seen, | 475 | GNUNET_memcpy (&pr->replies_seen[pr->replies_seen_count], replies_seen, |
476 | sizeof (struct GNUNET_HashCode) * replies_seen_count); | 476 | sizeof (struct GNUNET_HashCode) * replies_seen_count); |
477 | pr->replies_seen_count += replies_seen_count; | 477 | pr->replies_seen_count += replies_seen_count; |
478 | refresh_bloomfilter (pr); | 478 | refresh_bloomfilter (pr); |
@@ -595,7 +595,7 @@ GSF_pending_request_get_message_ (struct GSF_PendingRequest *pr, | |||
595 | GNUNET_CONTAINER_bloomfilter_get_raw_data (pr->bf, | 595 | GNUNET_CONTAINER_bloomfilter_get_raw_data (pr->bf, |
596 | (char *) &ext[k], | 596 | (char *) &ext[k], |
597 | bf_size)); | 597 | bf_size)); |
598 | memcpy (buf, gm, msize); | 598 | GNUNET_memcpy (buf, gm, msize); |
599 | return msize; | 599 | return msize; |
600 | } | 600 | } |
601 | 601 | ||
@@ -1186,7 +1186,7 @@ GSF_dht_lookup_ (struct GSF_PendingRequest *pr) | |||
1186 | { | 1186 | { |
1187 | GNUNET_assert (0 != pr->sender_pid); | 1187 | GNUNET_assert (0 != pr->sender_pid); |
1188 | GNUNET_PEER_resolve (pr->sender_pid, &pi); | 1188 | GNUNET_PEER_resolve (pr->sender_pid, &pi); |
1189 | memcpy (&buf[xquery_size], &pi, sizeof (struct GNUNET_PeerIdentity)); | 1189 | GNUNET_memcpy (&buf[xquery_size], &pi, sizeof (struct GNUNET_PeerIdentity)); |
1190 | xquery_size += sizeof (struct GNUNET_PeerIdentity); | 1190 | xquery_size += sizeof (struct GNUNET_PeerIdentity); |
1191 | } | 1191 | } |
1192 | pr->gh = | 1192 | pr->gh = |
diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c index 71a8e81e4..59f3772f5 100644 --- a/src/fs/gnunet-service-fs_push.c +++ b/src/fs/gnunet-service-fs_push.c | |||
@@ -238,7 +238,7 @@ transmit_message (void *cls, | |||
238 | } | 238 | } |
239 | msize = ntohs (msg->header.size); | 239 | msize = ntohs (msg->header.size); |
240 | GNUNET_assert (msize <= buf_size); | 240 | GNUNET_assert (msize <= buf_size); |
241 | memcpy (buf, msg, msize); | 241 | GNUNET_memcpy (buf, msg, msize); |
242 | GNUNET_free (msg); | 242 | GNUNET_free (msg); |
243 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 243 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
244 | "Pushing %u bytes to %s\n", | 244 | "Pushing %u bytes to %s\n", |
@@ -274,7 +274,7 @@ transmit_content (struct MigrationReadyPeer *peer, | |||
274 | msg->header.size = htons (msize); | 274 | msg->header.size = htons (msize); |
275 | msg->type = htonl (block->type); | 275 | msg->type = htonl (block->type); |
276 | msg->expiration = GNUNET_TIME_absolute_hton (block->expiration); | 276 | msg->expiration = GNUNET_TIME_absolute_hton (block->expiration); |
277 | memcpy (&msg[1], &block[1], block->size); | 277 | GNUNET_memcpy (&msg[1], &block[1], block->size); |
278 | peer->msg = msg; | 278 | peer->msg = msg; |
279 | for (i = 0; i < MIGRATION_LIST_SIZE; i++) | 279 | for (i = 0; i < MIGRATION_LIST_SIZE; i++) |
280 | { | 280 | { |
@@ -541,7 +541,7 @@ process_migration_content (void *cls, | |||
541 | mb->expiration = expiration; | 541 | mb->expiration = expiration; |
542 | mb->size = size; | 542 | mb->size = size; |
543 | mb->type = type; | 543 | mb->type = type; |
544 | memcpy (&mb[1], data, size); | 544 | GNUNET_memcpy (&mb[1], data, size); |
545 | GNUNET_CONTAINER_DLL_insert_after (mig_head, | 545 | GNUNET_CONTAINER_DLL_insert_after (mig_head, |
546 | mig_tail, | 546 | mig_tail, |
547 | mig_tail, | 547 | mig_tail, |