* cris-dis.c (format_hex): Remove ineffective warning fix.

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

diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c
index f8aa4a8d096b34e7acb948216558bf9fc2d7bb56..36041d657ea53fb98ff101a02788be79ebdc71bc 100644 (file)
--- a/gdb/dwarfread.c
+++ b/gdb/dwarfread.c
@@ -135,7 +135,7 @@ static void
 bad_die_ref_complaint (int arg1, const char *arg2, int arg3)
 {
   complaint (&symfile_complaints,
-            "DIE @ 0x%x \"%s\", reference to DIE (0x%x) outside compilation unit",
+            _("DIE @ 0x%x \"%s\", reference to DIE (0x%x) outside compilation unit"),
             arg1, arg2, arg3);
 }
 
@@ -143,7 +143,7 @@ static void
 unknown_attribute_form_complaint (int arg1, const char *arg2, int arg3)
 {
   complaint (&symfile_complaints,
-            "DIE @ 0x%x \"%s\", unknown attribute form (0x%x)", arg1, arg2,
+            _("DIE @ 0x%x \"%s\", unknown attribute form (0x%x)"), arg1, arg2,
             arg3);
 }
 
@@ -151,7 +151,7 @@ static void
 dup_user_type_definition_complaint (int arg1, const char *arg2)
 {
   complaint (&symfile_complaints,
-            "DIE @ 0x%x \"%s\", internal error: duplicate user type definition",
+            _("DIE @ 0x%x \"%s\", internal error: duplicate user type definition"),
             arg1, arg2);
 }
 
@@ -159,7 +159,7 @@ static void
 bad_array_element_type_complaint (int arg1, const char *arg2, int arg3)
 {
   complaint (&symfile_complaints,
-            "DIE @ 0x%x \"%s\", bad array element type attribute 0x%x", arg1,
+            _("DIE @ 0x%x \"%s\", bad array element type attribute 0x%x"), arg1,
             arg2, arg3);
 }
 
@@ -558,7 +558,7 @@ dwarf_fundamental_type (struct objfile *objfile, int typeid)
 {
   if (typeid < 0 || typeid >= FT_NUM_MEMBERS)
     {
-      error ("internal error - invalid fundamental type id %d", typeid);
+      error (_("internal error - invalid fundamental type id %d"), typeid);
     }
 
   /* Look for this particular type in the fundamental type vector.  If one is
@@ -677,7 +677,7 @@ dwarf_build_psymtabs (struct objfile *objfile, int mainline, file_ptr dbfoff,
       (bfd_bread (dbbase, dbsize, abfd) != dbsize))
     {
       xfree (dbbase);
-      error ("can't read DWARF data from '%s'", bfd_get_filename (abfd));
+      error (_("can't read DWARF data from '%s'"), bfd_get_filename (abfd));
     }
   back_to = make_cleanup (xfree, dbbase);
 
@@ -818,7 +818,7 @@ alloc_utype (DIE_REF die_ref, struct type *utypep)
     {
       utypep = *typep;
       complaint (&symfile_complaints,
-                "DIE @ 0x%x \"%s\", internal error: duplicate user type allocation",
+                _("DIE @ 0x%x \"%s\", internal error: duplicate user type allocation"),
                 DIE_ID, DIE_NAME);
     }
   else
@@ -967,7 +967,7 @@ struct_type (struct dieinfo *dip, char *thisdie, char *enddie,
       /* Should never happen */
       TYPE_CODE (type) = TYPE_CODE_UNDEF;
       complaint (&symfile_complaints,
-                "DIE @ 0x%x \"%s\", missing class, structure, or union tag",
+                _("DIE @ 0x%x \"%s\", missing class, structure, or union tag"),
                 DIE_ID, DIE_NAME);
       break;
     }
@@ -1306,7 +1306,7 @@ decode_subscript_data_item (char *scan, char *end)
        {
          /* Munged subscript data or other problem, fake it. */
          complaint (&symfile_complaints,
-                    "DIE @ 0x%x \"%s\", can't decode subscript data items",
+                    _("DIE @ 0x%x \"%s\", can't decode subscript data items"),
                     DIE_ID, DIE_NAME);
          nexttype = dwarf_fundamental_type (current_objfile, FT_INTEGER);
        }
@@ -1322,7 +1322,7 @@ decode_subscript_data_item (char *scan, char *end)
     case FMT_UT_X_C:
     case FMT_UT_X_X:
       complaint (&symfile_complaints,
-                "DIE @ 0x%x \"%s\", array subscript format 0x%x not handled yet",
+                _("DIE @ 0x%x \"%s\", array subscript format 0x%x not handled yet"),
                 DIE_ID, DIE_NAME, format);
       nexttype = dwarf_fundamental_type (current_objfile, FT_INTEGER);
       rangetype = create_range_type ((struct type *) NULL, nexttype, 0, 0);
@@ -1330,7 +1330,7 @@ decode_subscript_data_item (char *scan, char *end)
       break;
     default:
       complaint (&symfile_complaints,
-                "DIE @ 0x%x \"%s\", unknown array subscript format %x", DIE_ID,
+                _("DIE @ 0x%x \"%s\", unknown array subscript format %x"), DIE_ID,
                 DIE_NAME, format);
       nexttype = dwarf_fundamental_type (current_objfile, FT_INTEGER);
       rangetype = create_range_type ((struct type *) NULL, nexttype, 0, 0);
@@ -1370,7 +1370,7 @@ dwarf_read_array_type (struct dieinfo *dip)
     {
       /* FIXME:  Can gdb even handle column major arrays? */
       complaint (&symfile_complaints,
-                "DIE @ 0x%x \"%s\", array not row major; not handled correctly",
+                _("DIE @ 0x%x \"%s\", array not row major; not handled correctly"),
                 DIE_ID, DIE_NAME);
     }
   sub = dip->at_subscr_data;
@@ -1787,7 +1787,7 @@ read_func_scope (struct dieinfo *dip, char *thisdie, char *enddie,
      FIXME: Add code to handle AT_abstract_origin tags properly.  */
   if (dip->at_name == NULL)
     {
-      complaint (&symfile_complaints, "DIE @ 0x%x, AT_name tag missing",
+      complaint (&symfile_complaints, _("DIE @ 0x%x, AT_name tag missing"),
                 DIE_ID);
       return;
     }
@@ -2210,12 +2210,12 @@ locval (struct dieinfo *dip)
        case OP_DEREF2:
          /* pop, deref and push 2 bytes (as a long) */
          complaint (&symfile_complaints,
-                    "DIE @ 0x%x \"%s\", OP_DEREF2 address 0x%lx not handled",
+                    _("DIE @ 0x%x \"%s\", OP_DEREF2 address 0x%lx not handled"),
                     DIE_ID, DIE_NAME, stack[stacki]);
          break;
        case OP_DEREF4: /* pop, deref and push 4 bytes (as a long) */
          complaint (&symfile_complaints,
-                    "DIE @ 0x%x \"%s\", OP_DEREF4 address 0x%lx not handled",
+                    _("DIE @ 0x%x \"%s\", OP_DEREF4 address 0x%lx not handled"),
                     DIE_ID, DIE_NAME, stack[stacki]);
          break;
        case OP_ADD:            /* pop top 2 items, add, push result */
@@ -2272,7 +2272,7 @@ read_ofile_symtab (struct partial_symtab *pst)
       (bfd_bread (dbbase, dbsize, abfd) != dbsize))
     {
       xfree (dbbase);
-      error ("can't read DWARF data");
+      error (_("can't read DWARF data"));
     }
   back_to = make_cleanup (xfree, dbbase);
 
@@ -2288,7 +2288,7 @@ read_ofile_symtab (struct partial_symtab *pst)
          (bfd_bread (lnsizedata, sizeof (lnsizedata), abfd)
           != sizeof (lnsizedata)))
        {
-         error ("can't read DWARF line number table size");
+         error (_("can't read DWARF line number table size"));
        }
       lnsize = target_to_host (lnsizedata, SIZEOF_LINETBL_LENGTH,
                               GET_UNSIGNED, pst->objfile);
@@ -2297,7 +2297,7 @@ read_ofile_symtab (struct partial_symtab *pst)
          (bfd_bread (lnbase, lnsize, abfd) != lnsize))
        {
          xfree (lnbase);
-         error ("can't read DWARF line numbers");
+         error (_("can't read DWARF line numbers"));
        }
       make_cleanup (xfree, lnbase);
     }
@@ -2335,7 +2335,7 @@ psymtab_to_symtab_1 (struct partial_symtab *pst)
     {
       if (pst->readin)
        {
-         warning ("psymtab for %s already read in.  Shouldn't happen.",
+         warning (_("psymtab for %s already read in.  Shouldn't happen."),
                   pst->filename);
        }
       else
@@ -2348,6 +2348,8 @@ psymtab_to_symtab_1 (struct partial_symtab *pst)
                  /* Inform about additional files that need to be read in. */
                  if (info_verbose)
                    {
+                     /* FIXME: i18n: Need to make this a single
+                        string.  */
                      fputs_filtered (" ", gdb_stdout);
                      wrap_here ("");
                      fputs_filtered ("and ", gdb_stdout);
@@ -2367,7 +2369,7 @@ psymtab_to_symtab_1 (struct partial_symtab *pst)
              read_ofile_symtab (pst);
              if (info_verbose)
                {
-                 printf_filtered ("%d DIE's, sorting...", diecount);
+                 printf_filtered (_("%d DIE's, sorting..."), diecount);
                  wrap_here ("");
                  gdb_flush (gdb_stdout);
                }
@@ -2404,7 +2406,7 @@ dwarf_psymtab_to_symtab (struct partial_symtab *pst)
     {
       if (pst->readin)
        {
-         warning ("psymtab for %s already read in.  Shouldn't happen.",
+         warning (_("psymtab for %s already read in.  Shouldn't happen."),
                   pst->filename);
        }
       else
@@ -2415,7 +2417,7 @@ dwarf_psymtab_to_symtab (struct partial_symtab *pst)
                 disconcerting pauses.  */
              if (info_verbose)
                {
-                 printf_filtered ("Reading in symbols for %s...",
+                 printf_filtered (_("Reading in symbols for %s..."),
                                   pst->filename);
                  gdb_flush (gdb_stdout);
                }
@@ -2434,7 +2436,7 @@ dwarf_psymtab_to_symtab (struct partial_symtab *pst)
              /* Finish up the verbose info message.  */
              if (info_verbose)
                {
-                 printf_filtered ("done.\n");
+                 printf_filtered (_("done.\n"));
                  gdb_flush (gdb_stdout);
                }
            }
@@ -3185,7 +3187,7 @@ decode_modified_type (char *modifiers, unsigned int modcount, int mtype)
          break;
        default:
          complaint (&symfile_complaints,
-                    "DIE @ 0x%x \"%s\", botched modified type decoding (mtype 0x%x)",
+                    _("DIE @ 0x%x \"%s\", botched modified type decoding (mtype 0x%x)"),
                     DIE_ID, DIE_NAME, mtype);
          typep = dwarf_fundamental_type (current_objfile, FT_INTEGER);
          break;
@@ -3205,12 +3207,12 @@ decode_modified_type (char *modifiers, unsigned int modcount, int mtype)
          break;
        case MOD_const:
          complaint (&symfile_complaints,
-                    "DIE @ 0x%x \"%s\", type modifier 'const' ignored", DIE_ID,
+                    _("DIE @ 0x%x \"%s\", type modifier 'const' ignored"), DIE_ID,
                     DIE_NAME); /* FIXME */
          break;
        case MOD_volatile:
          complaint (&symfile_complaints,
-                    "DIE @ 0x%x \"%s\", type modifier 'volatile' ignored",
+                    _("DIE @ 0x%x \"%s\", type modifier 'volatile' ignored"),
                     DIE_ID, DIE_NAME); /* FIXME */
          break;
        default:
@@ -3222,7 +3224,7 @@ decode_modified_type (char *modifiers, unsigned int modcount, int mtype)
 #endif
            {
              complaint (&symfile_complaints,
-                        "DIE @ 0x%x \"%s\", unknown type modifier %u", DIE_ID,
+                        _("DIE @ 0x%x \"%s\", unknown type modifier %u"), DIE_ID,
                         DIE_NAME, modifier);
            }
          break;
@@ -3366,7 +3368,7 @@ decode_fund_type (unsigned int fundtype)
       if (!(FT_lo_user <= fundtype && fundtype <= FT_hi_user))
        {
          complaint (&symfile_complaints,
-                    "DIE @ 0x%x \"%s\", unexpected fundamental type 0x%x",
+                    _("DIE @ 0x%x \"%s\", unexpected fundamental type 0x%x"),
                     DIE_ID, DIE_NAME, fundtype);
        }
     }
@@ -3466,7 +3468,7 @@ basicdieinfo (struct dieinfo *dip, char *diep, struct objfile *objfile)
       ((diep + dip->die_length) > (dbbase + dbsize)))
     {
       complaint (&symfile_complaints,
-                "DIE @ 0x%x \"%s\", malformed DIE, bad length (%ld bytes)",
+                _("DIE @ 0x%x \"%s\", malformed DIE, bad length (%ld bytes)"),
                 DIE_ID, DIE_NAME, dip->die_length);
       dip->die_length = 0;
     }
@@ -3535,7 +3537,7 @@ completedieinfo (struct dieinfo *dip, struct objfile *objfile)
       if (nbytes == -1)
        {
          complaint (&symfile_complaints,
-                    "DIE @ 0x%x \"%s\", unknown attribute length, skipped remaining attributes",
+                    _("DIE @ 0x%x \"%s\", unknown attribute length, skipped remaining attributes"),
                     DIE_ID, DIE_NAME);
          diep = end;
          continue;
@@ -3751,7 +3753,7 @@ target_to_host (char *from, int nbytes, int signextend,   /* FIXME:  Unused */
       break;
     default:
       complaint (&symfile_complaints,
-                "DIE @ 0x%x \"%s\", no bfd support for %d byte data object",
+                _("DIE @ 0x%x \"%s\", no bfd support for %d byte data object"),
                 DIE_ID, DIE_NAME, nbytes);
       rtnval = 0;
       break;