A mostly cosmetic tidy up of warnings and error message reporting.

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

diff --git a/binutils/size.c b/binutils/size.c
index 9bd8a453dfcf3fe9e95c715f7c89acd9e9a2db06..070834b63c09da1273191354cbf35786a4fc39f1 100644 (file)
--- a/binutils/size.c
+++ b/binutils/size.c
@@ -1,5 +1,6 @@
 /* size.c -- report size of various sections of an executable file.
-   Copyright 1991, 92, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
+   Copyright 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000
+   Free Software Foundation, Inc.
 
 This file is part of GNU Binutils.
 
@@ -85,7 +86,7 @@ Usage: %s [-ABdoxV] [--format=berkeley|sysv] [--radix=8|10|16]\n\
 #endif
   list_supported_targets (program_name, stream);
   if (status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
   exit (status);
 }
 
@@ -107,7 +108,9 @@ main (argc, argv)
   int temp;
   int c;
 
+#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
   setlocale (LC_MESSAGES, "");
+#endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
@@ -133,7 +136,7 @@ main (argc, argv)
            berkeley_format = 0;
            break;
          default:
-           fprintf (stderr, _("invalid argument to --format: %s\n"), optarg);
+           non_fatal (_("invalid argument to --format: %s"), optarg);
            usage (stderr, 1);
          }
        break;
@@ -160,7 +163,7 @@ main (argc, argv)
            radix = hex;
            break;
          default:
-           printf (_("Invalid radix: %s\n"), optarg);
+           non_fatal (_("Invalid radix: %s\n"), optarg);
            usage (stderr, 1);
          }
        break;
@@ -363,9 +366,9 @@ static bfd_size_type textsize;
 
 static void
 berkeley_sum (abfd, sec, ignore)
-     bfd *abfd;
+     bfd *abfd ATTRIBUTE_UNUSED;
      sec_ptr sec;
-     PTR ignore;
+     PTR ignore ATTRIBUTE_UNUSED;
 {
   flagword flags;
   bfd_size_type size;
@@ -430,9 +433,9 @@ int svi_sizelen = 0;
 
 static void
 sysv_internal_sizer (file, sec, ignore)
-     bfd *file;
+     bfd *file ATTRIBUTE_UNUSED;
      sec_ptr sec;
-     PTR ignore;
+     PTR ignore ATTRIBUTE_UNUSED;
 {
   bfd_size_type size = bfd_section_size (file, sec);
   if (!bfd_is_abs_section (sec)
@@ -451,9 +454,9 @@ sysv_internal_sizer (file, sec, ignore)
 
 static void
 sysv_internal_printer (file, sec, ignore)
-     bfd *file;
+     bfd *file ATTRIBUTE_UNUSED;
      sec_ptr sec;
-     PTR ignore;
+     PTR ignore ATTRIBUTE_UNUSED;
 {
   bfd_size_type size = bfd_section_size (file, sec);
   if (!bfd_is_abs_section (sec)