[GNUnet-SVN] r24623 - gnunet/src/util

[gnunet]

Author: LRN
Date: 2012-10-30 23:11:56 +0100 (Tue, 30 Oct 2012)
New Revision: 24623

Modified:
   gnunet/src/util/strings.c
   gnunet/src/util/test_strings.c
Log:
Restore warnings, fix test compilation

Modified: gnunet/src/util/strings.c
===================================================================
--- gnunet/src/util/strings.c   2012-10-30 21:23:27 UTC (rev 24622)
+++ gnunet/src/util/strings.c   2012-10-30 22:11:56 UTC (rev 24623)
@@ -381,6 +381,8 @@
   if (NULL == u8_string)
   {
     LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "u8_conv_from_encoding");
+    LOG (GNUNET_ERROR_TYPE_WARNING, _("Character sets requested were 
`%s'->`%s'\n"),
+         input_charset, "UTF-8");
     ret = GNUNET_malloc (len + 1);
     memcpy (ret, input, len);
     ret[len] = '\0';
@@ -399,6 +401,8 @@
   if (NULL == encoded_string)
   {
     LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "u8_conv_to_encoding");
+    LOG (GNUNET_ERROR_TYPE_WARNING, _("Character sets requested were 
`%s'->`%s'\n"),
+         "UTF-8", output_charset);
     ret = GNUNET_malloc (len + 1);
     memcpy (ret, input, len);
     ret[len] = '\0';

Modified: gnunet/src/util/test_strings.c
===================================================================
--- gnunet/src/util/test_strings.c      2012-10-30 21:23:27 UTC (rev 24622)
+++ gnunet/src/util/test_strings.c      2012-10-30 22:11:56 UTC (rev 24623)
@@ -105,12 +105,10 @@
                 GNUNET_STRINGS_fancy_time_to_absolute (bc, &atx));
   GNUNET_assert (atx.abs_value == at.abs_value);
 
-#if ENABLE_NLS && HAVE_ICONV
   GNUNET_log_skip (2, GNUNET_NO);
   b = GNUNET_STRINGS_to_utf8 ("TEST", 4, "unknown");
   GNUNET_log_skip (0, GNUNET_YES);
   WANT ("TEST", b);
-#endif
   return 0;
 }