diff options
Diffstat (limited to 'src/util/container_meta_data.c')
-rw-r--r-- | src/util/container_meta_data.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c index 647cc1d60..d7c5ddb11 100644 --- a/src/util/container_meta_data.c +++ b/src/util/container_meta_data.c | |||
@@ -406,7 +406,7 @@ GNUNET_CONTAINER_meta_data_insert (struct GNUNET_CONTAINER_MetaData *md, | |||
406 | (NULL == data_mime_type) ? NULL : GNUNET_strdup (data_mime_type); | 406 | (NULL == data_mime_type) ? NULL : GNUNET_strdup (data_mime_type); |
407 | mi->plugin_name = (NULL == plugin_name) ? NULL : GNUNET_strdup (plugin_name); | 407 | mi->plugin_name = (NULL == plugin_name) ? NULL : GNUNET_strdup (plugin_name); |
408 | mi->data = GNUNET_malloc (data_size); | 408 | mi->data = GNUNET_malloc (data_size); |
409 | memcpy (mi->data, data, data_size); | 409 | GNUNET_memcpy (mi->data, data, data_size); |
410 | /* change all dir separators to POSIX style ('/') */ | 410 | /* change all dir separators to POSIX style ('/') */ |
411 | if ( (EXTRACTOR_METATYPE_FILENAME == type) || | 411 | if ( (EXTRACTOR_METATYPE_FILENAME == type) || |
412 | (EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME == type) ) | 412 | (EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME == type) ) |
@@ -656,7 +656,7 @@ GNUNET_CONTAINER_meta_data_get_thumbnail (const struct GNUNET_CONTAINER_MetaData | |||
656 | if ((NULL == match) || (0 == match->data_size)) | 656 | if ((NULL == match) || (0 == match->data_size)) |
657 | return 0; | 657 | return 0; |
658 | *thumb = GNUNET_malloc (match->data_size); | 658 | *thumb = GNUNET_malloc (match->data_size); |
659 | memcpy (*thumb, match->data, match->data_size); | 659 | GNUNET_memcpy (*thumb, match->data, match->data_size); |
660 | return match->data_size; | 660 | return match->data_size; |
661 | } | 661 | } |
662 | 662 | ||
@@ -816,7 +816,7 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData | |||
816 | { | 816 | { |
817 | if (NULL == *target) | 817 | if (NULL == *target) |
818 | *target = GNUNET_malloc (md->sbuf_size); | 818 | *target = GNUNET_malloc (md->sbuf_size); |
819 | memcpy (*target, md->sbuf, md->sbuf_size); | 819 | GNUNET_memcpy (*target, md->sbuf, md->sbuf_size); |
820 | return md->sbuf_size; | 820 | return md->sbuf_size; |
821 | } | 821 | } |
822 | if (0 == (opt & GNUNET_CONTAINER_META_DATA_SERIALIZE_PART)) | 822 | if (0 == (opt & GNUNET_CONTAINER_META_DATA_SERIALIZE_PART)) |
@@ -868,13 +868,13 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData | |||
868 | if ((EXTRACTOR_METAFORMAT_UTF8 == pos->format) || | 868 | if ((EXTRACTOR_METAFORMAT_UTF8 == pos->format) || |
869 | (EXTRACTOR_METAFORMAT_C_STRING == pos->format)) | 869 | (EXTRACTOR_METAFORMAT_C_STRING == pos->format)) |
870 | GNUNET_break ('\0' == pos->data[pos->data_size - 1]); | 870 | GNUNET_break ('\0' == pos->data[pos->data_size - 1]); |
871 | memcpy (&mdata[off], pos->data, pos->data_size); | 871 | GNUNET_memcpy (&mdata[off], pos->data, pos->data_size); |
872 | off -= plen; | 872 | off -= plen; |
873 | if (NULL != pos->plugin_name) | 873 | if (NULL != pos->plugin_name) |
874 | memcpy (&mdata[off], pos->plugin_name, plen); | 874 | GNUNET_memcpy (&mdata[off], pos->plugin_name, plen); |
875 | off -= mlen; | 875 | off -= mlen; |
876 | if (NULL != pos->mime_type) | 876 | if (NULL != pos->mime_type) |
877 | memcpy (&mdata[off], pos->mime_type, mlen); | 877 | GNUNET_memcpy (&mdata[off], pos->mime_type, mlen); |
878 | i++; | 878 | i++; |
879 | } | 879 | } |
880 | GNUNET_assert (0 == off); | 880 | GNUNET_assert (0 == off); |
@@ -905,13 +905,13 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData | |||
905 | { | 905 | { |
906 | GNUNET_assert (clen < left); | 906 | GNUNET_assert (clen < left); |
907 | hdr->version = htonl (2 | HEADER_COMPRESSED); | 907 | hdr->version = htonl (2 | HEADER_COMPRESSED); |
908 | memcpy (&hdr[1], cdata, clen); | 908 | GNUNET_memcpy (&hdr[1], cdata, clen); |
909 | vmd->sbuf_size = clen + sizeof (struct MetaDataHeader); | 909 | vmd->sbuf_size = clen + sizeof (struct MetaDataHeader); |
910 | } | 910 | } |
911 | else | 911 | else |
912 | { | 912 | { |
913 | hdr->version = htonl (2); | 913 | hdr->version = htonl (2); |
914 | memcpy (&hdr[1], &ent[0], left); | 914 | GNUNET_memcpy (&hdr[1], &ent[0], left); |
915 | vmd->sbuf_size = left + sizeof (struct MetaDataHeader); | 915 | vmd->sbuf_size = left + sizeof (struct MetaDataHeader); |
916 | } | 916 | } |
917 | vmd->sbuf = (char *) hdr; | 917 | vmd->sbuf = (char *) hdr; |
@@ -929,7 +929,7 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData | |||
929 | hdr->version = htonl (2 | HEADER_COMPRESSED); | 929 | hdr->version = htonl (2 | HEADER_COMPRESSED); |
930 | hdr->size = htonl (left); | 930 | hdr->size = htonl (left); |
931 | hdr->entries = htonl (md->item_count - i); | 931 | hdr->entries = htonl (md->item_count - i); |
932 | memcpy (&dst[sizeof (struct MetaDataHeader)], cdata, clen); | 932 | GNUNET_memcpy (&dst[sizeof (struct MetaDataHeader)], cdata, clen); |
933 | GNUNET_free (cdata); | 933 | GNUNET_free (cdata); |
934 | cdata = NULL; | 934 | cdata = NULL; |
935 | GNUNET_free (ent); | 935 | GNUNET_free (ent); |
@@ -943,16 +943,16 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData | |||
943 | hdr->version = htonl (2); | 943 | hdr->version = htonl (2); |
944 | hdr->entries = htonl (md->item_count - i); | 944 | hdr->entries = htonl (md->item_count - i); |
945 | hdr->size = htonl (left); | 945 | hdr->size = htonl (left); |
946 | memcpy (&dst[sizeof (struct MetaDataHeader)], &ent[i], left); | 946 | GNUNET_memcpy (&dst[sizeof (struct MetaDataHeader)], &ent[i], left); |
947 | GNUNET_free (ent); | 947 | GNUNET_free (ent); |
948 | rlen = left + sizeof (struct MetaDataHeader); | 948 | rlen = left + sizeof (struct MetaDataHeader); |
949 | } | 949 | } |
950 | if (NULL != *target) | 950 | if (NULL != *target) |
951 | { | 951 | { |
952 | if (GNUNET_YES == comp) | 952 | if (GNUNET_YES == comp) |
953 | memcpy (*target, dst, clen + sizeof (struct MetaDataHeader)); | 953 | GNUNET_memcpy (*target, dst, clen + sizeof (struct MetaDataHeader)); |
954 | else | 954 | else |
955 | memcpy (*target, dst, left + sizeof (struct MetaDataHeader)); | 955 | GNUNET_memcpy (*target, dst, left + sizeof (struct MetaDataHeader)); |
956 | GNUNET_free (dst); | 956 | GNUNET_free (dst); |
957 | } | 957 | } |
958 | else | 958 | else |
@@ -991,7 +991,7 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData | |||
991 | ihdr.size = htonl (0); | 991 | ihdr.size = htonl (0); |
992 | if (NULL == *target) | 992 | if (NULL == *target) |
993 | *target = (char *) GNUNET_new (struct MetaDataHeader); | 993 | *target = (char *) GNUNET_new (struct MetaDataHeader); |
994 | memcpy (*target, &ihdr, sizeof (struct MetaDataHeader)); | 994 | GNUNET_memcpy (*target, &ihdr, sizeof (struct MetaDataHeader)); |
995 | return sizeof (struct MetaDataHeader); | 995 | return sizeof (struct MetaDataHeader); |
996 | } | 996 | } |
997 | 997 | ||
@@ -1054,7 +1054,7 @@ GNUNET_CONTAINER_meta_data_deserialize (const char *input, size_t size) | |||
1054 | 1054 | ||
1055 | if (size < sizeof (struct MetaDataHeader)) | 1055 | if (size < sizeof (struct MetaDataHeader)) |
1056 | return NULL; | 1056 | return NULL; |
1057 | memcpy (&hdr, input, sizeof (struct MetaDataHeader)); | 1057 | GNUNET_memcpy (&hdr, input, sizeof (struct MetaDataHeader)); |
1058 | version = ntohl (hdr.version) & HEADER_VERSION_MASK; | 1058 | version = ntohl (hdr.version) & HEADER_VERSION_MASK; |
1059 | compressed = (ntohl (hdr.version) & HEADER_COMPRESSED) != 0; | 1059 | compressed = (ntohl (hdr.version) & HEADER_COMPRESSED) != 0; |
1060 | 1060 | ||
@@ -1112,7 +1112,7 @@ GNUNET_CONTAINER_meta_data_deserialize (const char *input, size_t size) | |||
1112 | mdata = &cdata[ic * sizeof (struct MetaDataEntry)]; | 1112 | mdata = &cdata[ic * sizeof (struct MetaDataEntry)]; |
1113 | for (i = 0; i < ic; i++) | 1113 | for (i = 0; i < ic; i++) |
1114 | { | 1114 | { |
1115 | memcpy (&ent, &cdata[i * sizeof (struct MetaDataEntry)], | 1115 | GNUNET_memcpy (&ent, &cdata[i * sizeof (struct MetaDataEntry)], |
1116 | sizeof (struct MetaDataEntry)); | 1116 | sizeof (struct MetaDataEntry)); |
1117 | format = (enum EXTRACTOR_MetaFormat) ntohl (ent.format); | 1117 | format = (enum EXTRACTOR_MetaFormat) ntohl (ent.format); |
1118 | if ((EXTRACTOR_METAFORMAT_UTF8 != format) && | 1118 | if ((EXTRACTOR_METAFORMAT_UTF8 != format) && |