Fix ARI warning about function names in first column.

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

diff --git a/gdb/charset.c b/gdb/charset.c
index ebde3f80e9101031547aaf254b378005728691f1..41cbc435f339678d674412c07a5bbcd404d716a7 100644 (file)
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -324,13 +324,13 @@ validate (struct gdbarch *gdbarch)
 
   desc = iconv_open (target_wide_cset, host_cset);
   if (desc == (iconv_t) -1)
-    error ("Cannot convert between character sets `%s' and `%s'",
+    error (_("Cannot convert between character sets `%s' and `%s'"),
           target_wide_cset, host_cset);
   iconv_close (desc);
 
   desc = iconv_open (target_cset, host_cset);
   if (desc == (iconv_t) -1)
-    error ("Cannot convert between character sets `%s' and `%s'",
+    error (_("Cannot convert between character sets `%s' and `%s'"),
           target_cset, host_cset);
   iconv_close (desc);
 
@@ -486,7 +486,7 @@ convert_between_encodings (const char *from, const char *to,
 
   desc = iconv_open (to, from);
   if (desc == (iconv_t) -1)
-    perror_with_name ("Converting character sets");
+    perror_with_name (_("Converting character sets"));
   cleanups = make_cleanup (cleanup_iconv, &desc);
 
   inleft = num_bytes;
@@ -522,8 +522,8 @@ convert_between_encodings (const char *from, const char *to,
 
                /* Invalid input sequence.  */
                if (translit == translit_none)
-                 error (_("Could not convert character to `%s' character set"),
-                        to);
+                 error (_("Could not convert character "
+                          "to `%s' character set"), to);
 
                /* We emit escape sequence for the bytes, skip them,
                   and try again.  */
@@ -553,7 +553,8 @@ convert_between_encodings (const char *from, const char *to,
              break;
 
            default:
-             perror_with_name ("Internal error while converting character sets");
+             perror_with_name (_("Internal error while "
+                                 "converting character sets"));
            }
        }
     }
@@ -592,7 +593,7 @@ make_wchar_iterator (const gdb_byte *input, size_t bytes,
 
   desc = iconv_open (INTERMEDIATE_ENCODING, charset);
   if (desc == (iconv_t) -1)
-    perror_with_name ("Converting character sets");
+    perror_with_name (_("Converting character sets"));
 
   result = XNEW (struct wchar_iterator);
   result->desc = desc;
@@ -693,7 +694,8 @@ wchar_iterate (struct wchar_iterator *iter,
              return 0;
 
            default:
-             perror_with_name ("Internal error while converting character sets");
+             perror_with_name (_("Internal error while "
+                                 "converting character sets"));
            }
        }
 
@@ -946,7 +948,8 @@ _initialize_charset (void)
   auto_target_charset_name = auto_host_charset_name;
 #elif defined (USE_WIN32API)
   {
-    static char w32_host_default_charset[16]; /* "CP" + x<=5 digits + paranoia.  */
+    /* "CP" + x<=5 digits + paranoia.  */
+    static char w32_host_default_charset[16];
 
     snprintf (w32_host_default_charset, sizeof w32_host_default_charset,
              "CP%d", GetACP());
@@ -1001,8 +1004,8 @@ To see a list of the character sets GDB supports, type `set target-charset'<TAB>
                        _("\
 Set the target wide character set."), _("\
 Show the target wide character set."), _("\
-The `target wide character set' is the one used by the program being debugged.\n\
-In particular it is the encoding used by `wchar_t'.\n\
+The `target wide character set' is the one used by the program being debugged.\
+\nIn particular it is the encoding used by `wchar_t'.\n\
 GDB translates characters and strings between the host and target\n\
 character sets as needed.\n\
 To see a list of the character sets GDB supports, type\n\