strings.c (usage): Place radix values for -t option into the correct order.

objcopy.c (add_redefine_syms_file): Change error messages to use
  <filename>:<linenumber>: format for easier parsing by automatic tools.

srconv.c (show_usage): Fix spelling typo.

windres.c (format_from_filename): Suggest the use of -J instead	of -I if the
  file type cannot be determined.

5 files changed, 23 insertions, 8 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index cb5abcc..9101bf5 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,18 @@
+2004-10-18  Tommy Pettersson <ptp@lysator.liu.se>
+	    Nick Clifton  <nickc@redhat.com>
+
+	* strings.c (usage): Place radix values for -t option into the
+	correct order.
+
+	* objcopy.c (add_redefine_syms_file): Change error messages to use
+	<filename>:<linenumber>: format for easier parsing by automatic
+	tools.
+
+	* srconv.c (show_usage): Fix spelling typo.
+
+	* windres.c (format_from_filename): Suggest the use of -J instead
+	of -I if the file type cannot be determined.
+
 2004-10-18  Aaron W. LaFramboise  <aaron98wiridge9@aaronwl.com>
 
 	* strings.c: Include <sys/stat.h>.
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 7fd6711..d5931b8 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -700,8 +700,8 @@ add_specific_symbols (const char *filename, struct symlist **list)
 	    ;
 
 	  if (! IS_LINE_TERMINATOR (* extra))
-	    non_fatal (_("Ignoring rubbish found on line %d of %s"),
-		       line_count, filename);
+	    non_fatal (_("%s:%d: Ignoring rubbish found on this line"),
+		       filename, line_count);
 	}
 
       * name_end = '\0';
@@ -1068,10 +1068,10 @@ add_redefine_syms_file (const char *filename)
 	  continue;
 	}
       else
-	fatal (_("%s: garbage at end of line %d"), filename, lineno);
+	fatal (_("%s:%d: garbage found at end of line"), filename, lineno);
  comment:
       if (len != 0 && (outsym_off == 0 || outsym_off == len))
-	fatal (_("%s: missing new symbol name at line %d"), filename, lineno);
+	fatal (_("%s:%d: missing new symbol name"), filename, lineno);
       buf[len++] = '\0';
 
       /* Eat the rest of the line and finish it.  */
@@ -1081,7 +1081,7 @@ add_redefine_syms_file (const char *filename)
     }
 
   if (len != 0)
-    fatal (_("%s: premature end of file at line %d"), filename, lineno);
+    fatal (_("%s:%d: premature end of file"), filename, lineno);
 
   free (buf);
 }
diff --git a/binutils/srconv.c b/binutils/srconv.c
index 68ebc78..1517b1c 100644
--- a/binutils/srconv.c
+++ b/binutils/srconv.c
@@ -1856,7 +1856,7 @@ show_usage (FILE *file, int status)
   fprintf (file, _("Usage: %s [option(s)] in-file [out-file]\n"), program_name);
   fprintf (file, _("Convert a COFF object file into a SYSROFF object file\n"));
   fprintf (file, _(" The options are:\n\
-  -q --quick       (Obsolete - ignoerd)\n\
+  -q --quick       (Obsolete - ignored)\n\
   -n --noprescan   Do not perform a scan to convert commons into defs\n\
   -d --debug       Display information about what is being done\n\
   -h --help        Display this information\n\
diff --git a/binutils/strings.c b/binutils/strings.c
index 5dd0284..2fcdb95 100644
--- a/binutils/strings.c
+++ b/binutils/strings.c
@@ -655,7 +655,7 @@ usage (FILE *stream, int status)
   -f --print-file-name      Print the name of the file before each string\n\
   -n --bytes=[number]       Locate & print any NUL-terminated sequence of at\n\
   -<number>                 least [number] characters (default 4).\n\
-  -t --radix={o,x,d}        Print the location of the string in base 8, 10 or 16\n\
+  -t --radix={o,d,x}        Print the location of the string in base 8, 10 or 16\n\
   -o                        An alias for --radix=o\n\
   -T --target=<BFDNAME>     Specify the binary file format\n\
   -e --encoding={s,S,b,l,B,L} Select character size and endianness:\n\
diff --git a/binutils/windres.c b/binutils/windres.c
index 1d23f10..5b7fdf1 100644
--- a/binutils/windres.c
+++ b/binutils/windres.c
@@ -620,7 +620,7 @@ format_from_filename (const char *filename, int input)
     return RES_FORMAT_RC;
 
   /* Otherwise, we give up.  */
-  fatal (_("can not determine type of file `%s'; use the -I option"),
+  fatal (_("can not determine type of file `%s'; use the -J option"),
 	 filename);
 
   /* Return something to silence the compiler warning.  */