gnupg/util (ChangeLog iobuf.c strgutil.c)

[cvs user wk]

    Date: Monday, December 20, 2004 @ 09:55:03
  Author: wk
    Path: /cvs/gnupg/gnupg/util

Modified: ChangeLog iobuf.c strgutil.c

(handle_iconv_error): Turn diagnostics into warnings
so that gpg does not return with failure.
(native_to_utf8, utf8_to_native): Ditto.


------------+
 ChangeLog  |   11 +++++++++++
 iobuf.c    |    2 +-
 strgutil.c |    8 ++++----
 3 files changed, 16 insertions(+), 5 deletions(-)


Index: gnupg/util/ChangeLog
diff -u gnupg/util/ChangeLog:1.172 gnupg/util/ChangeLog:1.173
--- gnupg/util/ChangeLog:1.172	Sat Dec 18 23:23:49 2004
+++ gnupg/util/ChangeLog	Mon Dec 20 09:55:03 2004
@@ -1,3 +1,14 @@
+2004-12-20  Werner Koch  <wk at g10code.com>
+
+	* strgutil.c (handle_iconv_error): Turn diagnostics into warnings
+	so that gpg does not return with failure.
+	(native_to_utf8, utf8_to_native): Ditto.
+
+2004-12-16  Werner Koch  <wk at g10code.com>
+
+	* iobuf.c (fd_cache_strcmp) [W32]: Casting is a Bad Thing. Cast to
+	an unsigned char pointer and to an unsigned integer.
+
 2004-12-18  David Shaw  <dshaw at jabberwocky.com>
 
 	* ttyio.c: Use only HAVE_LIBREADLINE to detect readline
Index: gnupg/util/iobuf.c
diff -u gnupg/util/iobuf.c:1.71 gnupg/util/iobuf.c:1.72
--- gnupg/util/iobuf.c:1.71	Mon Dec  6 11:32:20 2004
+++ gnupg/util/iobuf.c	Mon Dec 20 09:55:03 2004
@@ -146,7 +146,7 @@
                         || (*a == '\\' && *b == '/')) )
         break;
     }
-  return *(const unsigned *)a - *(const unsigned *)b;
+  return *(const unsigned char *)a - *(const unsigned char *)b;
 #else
   return strcmp (a, b);
 #endif
Index: gnupg/util/strgutil.c
diff -u gnupg/util/strgutil.c:1.45 gnupg/util/strgutil.c:1.46
--- gnupg/util/strgutil.c:1.45	Wed Nov  3 21:03:46 2004
+++ gnupg/util/strgutil.c	Mon Dec 20 09:55:03 2004
@@ -451,10 +451,10 @@
 handle_iconv_error (const char *to, const char *from, int use_fallback)
 {
   if (errno == EINVAL)
-    log_error (_("conversion from `%s' to `%s' not available\n"),
+    log_info (_("conversion from `%s' to `%s' not available\n"),
                from, to);
   else
-    log_error (_("iconv_open failed: %s\n"), strerror (errno));
+    log_info (_("iconv_open failed: %s\n"), strerror (errno));
 
   if (use_fallback)
     {
@@ -645,7 +645,7 @@
       if ( iconv (cd, (ICONV_CONST char **)&inptr, &inbytes,
                   &outptr, &outbytes) == (size_t)-1)
         {
-          log_error (_("conversion from `%s' to `%s' failed: %s\n"),
+          log_info (_("conversion from `%s' to `%s' failed: %s\n"),
                        active_charset_name, "utf-8", strerror (errno));
           /* We don't do any conversion at all but use the strings as is. */
           strcpy (buffer, string);
@@ -919,7 +919,7 @@
             outbuf = outptr = m_alloc (outbytes);
             if ( iconv (cd, (ICONV_CONST char **)&inptr, &inbytes,
                         &outptr, &outbytes) == (size_t)-1) {
-                log_error (_("conversion from `%s' to `%s' failed: %s\n"),
+                log_info (_("conversion from `%s' to `%s' failed: %s\n"),
                            "utf-8", active_charset_name, strerror (errno));
                 /* Didn't worked out.  Temporary disable the use of
                  * iconv and fall back to our old code. */