bfd_error_handler bfd_vma and bfd_size_type args

[deliverable/binutils-gdb.git] / bfd / mmo.c

diff --git a/bfd/mmo.c b/bfd/mmo.c
index 99a591bc74963892d492b21c21c47eb44c66c54c..03995e8be031e9331155381b978b47b3ec0e8876 100644 (file)
--- a/bfd/mmo.c
+++ b/bfd/mmo.c
@@ -956,8 +956,8 @@ mmo_write_loc_chunk (bfd *abfd, bfd_vma vma, const bfd_byte *loc,
          _bfd_error_handler
            /* xgettext:c-format */
            (_("%B: attempt to emit contents at non-multiple-of-4"
-              " address 0x%lx\n"),
-            abfd, (unsigned long) vma);
+              " address %#Lx"),
+            abfd, vma);
          bfd_set_error (bfd_error_bad_value);
          return FALSE;
        }
@@ -1602,7 +1602,7 @@ mmo_scan (bfd *abfd)
   bfd_size_type nbytes_read = 0;
   /* Buffer with room to read a 64-bit value.  */
   bfd_byte buf[8];
-  long stab_loc = -1;
+  file_ptr stab_loc = -1;
   char *file_names[256];
 
   abfd->symcount = 0;
@@ -2033,7 +2033,7 @@ mmo_scan (bfd *abfd)
                         " not equal to the number of tetras to the preceding"
                         " lop_stab (%ld)\n"),
                       abfd, (long) (y * 256 + z),
-                      (curpos - stab_loc - 4)/4);
+                      (long) (curpos - stab_loc - 4)/4);
                    bfd_set_error (bfd_error_bad_value);
                    goto error_return;
                  }
@@ -3239,15 +3239,14 @@ mmo_write_object_contents (bfd *abfd)
               global registers.  */
            _bfd_error_handler
              /* xgettext:c-format */
-             (_("%B: too many initialized registers; section length %ld\n"),
-              abfd, (long) sec->size);
+             (_("%B: too many initialized registers; section length %Ld"),
+              abfd, sec->size);
          else
            _bfd_error_handler
              /* xgettext:c-format */
              (_("%B: invalid start address for initialized registers of"
-                " length %ld: 0x%lx%08lx\n"),
-              abfd, (long) sec->size,
-              (unsigned long) (sec->vma >> 32), (unsigned long) (sec->vma));
+                " length %Ld: %#Lx"),
+              abfd, sec->size, sec->vma);
 
          return FALSE;
        }