opcodes: bfin: simplify field width processing and fix build warnings

[deliverable/binutils-gdb.git] / gdb / charset.c

diff --git a/gdb/charset.c b/gdb/charset.c
index 62977d11d00c2f78517d1b01953d59f6a086a31b..4a209a553cb3a1fcbf2fb117848f6a83175fbeb1 100644 (file)
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -108,7 +108,7 @@
 #define EILSEQ ENOENT
 #endif
 
-iconv_t
+static iconv_t
 phony_iconv_open (const char *to, const char *from)
 {
   /* We allow conversions from UTF-32BE, wchar_t, and the host charset.
@@ -124,13 +124,13 @@ phony_iconv_open (const char *to, const char *from)
   return !strcmp (from, "UTF-32BE");
 }
 
-int
+static int
 phony_iconv_close (iconv_t arg)
 {
   return 0;
 }
 
-size_t
+static size_t
 phony_iconv (iconv_t utf_flag, const char **inbuf, size_t *inbytesleft,
             char **outbuf, size_t *outbytesleft)
 {
@@ -839,7 +839,7 @@ find_charset_names (void)
         parse the glibc and libiconv formats; feel free to add others
         as needed.  */
 
-      while (!feof (in))
+      while (in != NULL && !feof (in))
        {
          /* The size of buf is chosen arbitrarily.  */
          char buf[1024];