diff options
author | LRN <lrn1986@gmail.com> | 2012-10-30 22:11:56 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2012-10-30 22:11:56 +0000 |
commit | 3b9cf09a1fbae43883b61c9fd0d33083fa7a6b6c (patch) | |
tree | c5a0454229a9f0ba09ba655c5c421b6f5989d1d5 | |
parent | 6af0c81915760f544a257c18299c021e1a273118 (diff) | |
download | gnunet-3b9cf09a1fbae43883b61c9fd0d33083fa7a6b6c.tar.gz gnunet-3b9cf09a1fbae43883b61c9fd0d33083fa7a6b6c.zip |
Restore warnings, fix test compilation
-rw-r--r-- | src/util/strings.c | 4 | ||||
-rw-r--r-- | src/util/test_strings.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/util/strings.c b/src/util/strings.c index 8063be07f..6fae8e713 100644 --- a/src/util/strings.c +++ b/src/util/strings.c | |||
@@ -381,6 +381,8 @@ GNUNET_STRINGS_conv (const char *input, size_t len, const char *input_charset, c | |||
381 | if (NULL == u8_string) | 381 | if (NULL == u8_string) |
382 | { | 382 | { |
383 | LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "u8_conv_from_encoding"); | 383 | LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "u8_conv_from_encoding"); |
384 | LOG (GNUNET_ERROR_TYPE_WARNING, _("Character sets requested were `%s'->`%s'\n"), | ||
385 | input_charset, "UTF-8"); | ||
384 | ret = GNUNET_malloc (len + 1); | 386 | ret = GNUNET_malloc (len + 1); |
385 | memcpy (ret, input, len); | 387 | memcpy (ret, input, len); |
386 | ret[len] = '\0'; | 388 | ret[len] = '\0'; |
@@ -399,6 +401,8 @@ GNUNET_STRINGS_conv (const char *input, size_t len, const char *input_charset, c | |||
399 | if (NULL == encoded_string) | 401 | if (NULL == encoded_string) |
400 | { | 402 | { |
401 | LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "u8_conv_to_encoding"); | 403 | LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "u8_conv_to_encoding"); |
404 | LOG (GNUNET_ERROR_TYPE_WARNING, _("Character sets requested were `%s'->`%s'\n"), | ||
405 | "UTF-8", output_charset); | ||
402 | ret = GNUNET_malloc (len + 1); | 406 | ret = GNUNET_malloc (len + 1); |
403 | memcpy (ret, input, len); | 407 | memcpy (ret, input, len); |
404 | ret[len] = '\0'; | 408 | ret[len] = '\0'; |
diff --git a/src/util/test_strings.c b/src/util/test_strings.c index a77acaa59..bc4169421 100644 --- a/src/util/test_strings.c +++ b/src/util/test_strings.c | |||
@@ -105,12 +105,10 @@ main (int argc, char *argv[]) | |||
105 | GNUNET_STRINGS_fancy_time_to_absolute (bc, &atx)); | 105 | GNUNET_STRINGS_fancy_time_to_absolute (bc, &atx)); |
106 | GNUNET_assert (atx.abs_value == at.abs_value); | 106 | GNUNET_assert (atx.abs_value == at.abs_value); |
107 | 107 | ||
108 | #if ENABLE_NLS && HAVE_ICONV | ||
109 | GNUNET_log_skip (2, GNUNET_NO); | 108 | GNUNET_log_skip (2, GNUNET_NO); |
110 | b = GNUNET_STRINGS_to_utf8 ("TEST", 4, "unknown"); | 109 | b = GNUNET_STRINGS_to_utf8 ("TEST", 4, "unknown"); |
111 | GNUNET_log_skip (0, GNUNET_YES); | 110 | GNUNET_log_skip (0, GNUNET_YES); |
112 | WANT ("TEST", b); | 111 | WANT ("TEST", b); |
113 | #endif | ||
114 | return 0; | 112 | return 0; |
115 | } | 113 | } |
116 | 114 | ||