diff options
Diffstat (limited to 'src/util/strings.c')
-rw-r--r-- | src/util/strings.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/util/strings.c b/src/util/strings.c index 06d05f2ef..abaaf23b2 100644 --- a/src/util/strings.c +++ b/src/util/strings.c | |||
@@ -79,7 +79,7 @@ GNUNET_STRINGS_buffer_fill (char *buffer, size_t size, unsigned int count, ...) | |||
79 | if (buffer != NULL) | 79 | if (buffer != NULL) |
80 | { | 80 | { |
81 | GNUNET_assert (needed + slen <= size); | 81 | GNUNET_assert (needed + slen <= size); |
82 | memcpy (&buffer[needed], s, slen); | 82 | GNUNET_memcpy (&buffer[needed], s, slen); |
83 | } | 83 | } |
84 | needed += slen; | 84 | needed += slen; |
85 | count--; | 85 | count--; |
@@ -412,7 +412,7 @@ GNUNET_STRINGS_conv (const char *input, | |||
412 | if (0 == strcmp (output_charset, "UTF-8")) | 412 | if (0 == strcmp (output_charset, "UTF-8")) |
413 | { | 413 | { |
414 | ret = GNUNET_malloc (u8_string_length + 1); | 414 | ret = GNUNET_malloc (u8_string_length + 1); |
415 | memcpy (ret, u8_string, u8_string_length); | 415 | GNUNET_memcpy (ret, u8_string, u8_string_length); |
416 | ret[u8_string_length] = '\0'; | 416 | ret[u8_string_length] = '\0'; |
417 | free (u8_string); | 417 | free (u8_string); |
418 | return ret; | 418 | return ret; |
@@ -428,7 +428,7 @@ GNUNET_STRINGS_conv (const char *input, | |||
428 | goto fail; | 428 | goto fail; |
429 | } | 429 | } |
430 | ret = GNUNET_malloc (encoded_string_length + 1); | 430 | ret = GNUNET_malloc (encoded_string_length + 1); |
431 | memcpy (ret, encoded_string, encoded_string_length); | 431 | GNUNET_memcpy (ret, encoded_string, encoded_string_length); |
432 | ret[encoded_string_length] = '\0'; | 432 | ret[encoded_string_length] = '\0'; |
433 | free (encoded_string); | 433 | free (encoded_string); |
434 | return ret; | 434 | return ret; |
@@ -437,7 +437,7 @@ GNUNET_STRINGS_conv (const char *input, | |||
437 | _("Character sets requested were `%s'->`%s'\n"), | 437 | _("Character sets requested were `%s'->`%s'\n"), |
438 | "UTF-8", output_charset); | 438 | "UTF-8", output_charset); |
439 | ret = GNUNET_malloc (len + 1); | 439 | ret = GNUNET_malloc (len + 1); |
440 | memcpy (ret, input, len); | 440 | GNUNET_memcpy (ret, input, len); |
441 | ret[len] = '\0'; | 441 | ret[len] = '\0'; |
442 | return ret; | 442 | return ret; |
443 | } | 443 | } |
@@ -500,7 +500,7 @@ GNUNET_STRINGS_utf8_tolower (const char *input, | |||
500 | 500 | ||
501 | tmp_in = u8_tolower ((uint8_t*)input, strlen ((char *) input), | 501 | tmp_in = u8_tolower ((uint8_t*)input, strlen ((char *) input), |
502 | NULL, UNINORM_NFD, NULL, &len); | 502 | NULL, UNINORM_NFD, NULL, &len); |
503 | memcpy(output, tmp_in, len); | 503 | GNUNET_memcpy(output, tmp_in, len); |
504 | output[len] = '\0'; | 504 | output[len] = '\0'; |
505 | free(tmp_in); | 505 | free(tmp_in); |
506 | } | 506 | } |
@@ -522,7 +522,7 @@ GNUNET_STRINGS_utf8_toupper(const char *input, | |||
522 | 522 | ||
523 | tmp_in = u8_toupper ((uint8_t*)input, strlen ((char *) input), | 523 | tmp_in = u8_toupper ((uint8_t*)input, strlen ((char *) input), |
524 | NULL, UNINORM_NFD, NULL, &len); | 524 | NULL, UNINORM_NFD, NULL, &len); |
525 | memcpy (output, tmp_in, len); | 525 | GNUNET_memcpy (output, tmp_in, len); |
526 | output[len] = '\0'; | 526 | output[len] = '\0'; |
527 | free (tmp_in); | 527 | free (tmp_in); |
528 | } | 528 | } |
@@ -1073,7 +1073,7 @@ GNUNET_STRINGS_parse_uri (const char *path, char **scheme_part, | |||
1073 | if (scheme_part) | 1073 | if (scheme_part) |
1074 | { | 1074 | { |
1075 | *scheme_part = GNUNET_malloc (post_scheme_part - path + 1); | 1075 | *scheme_part = GNUNET_malloc (post_scheme_part - path + 1); |
1076 | memcpy (*scheme_part, path, post_scheme_part - path); | 1076 | GNUNET_memcpy (*scheme_part, path, post_scheme_part - path); |
1077 | (*scheme_part)[post_scheme_part - path] = '\0'; | 1077 | (*scheme_part)[post_scheme_part - path] = '\0'; |
1078 | } | 1078 | } |
1079 | if (path_part) | 1079 | if (path_part) |
@@ -1222,7 +1222,7 @@ GNUNET_STRINGS_to_address_ipv6 (const char *zt_addr, | |||
1222 | 1222 | ||
1223 | if (addrlen < 6) | 1223 | if (addrlen < 6) |
1224 | return GNUNET_SYSERR; | 1224 | return GNUNET_SYSERR; |
1225 | memcpy (zbuf, zt_addr, addrlen); | 1225 | GNUNET_memcpy (zbuf, zt_addr, addrlen); |
1226 | if ('[' != zbuf[0]) | 1226 | if ('[' != zbuf[0]) |
1227 | { | 1227 | { |
1228 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1228 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |