merge with 1.5

1 files changed, 2 insertions, 6 deletions

diff --git a/src/cat.c b/src/cat.c
index 044c9a971..98da7c971 100644
--- a/src/cat.c
+++ b/src/cat.c
@@ -74,12 +74,8 @@ static int newlines2 = 0;
 static int exit_stat = 0;
 
 static void
-usage (reason)
-     char *reason;
+usage ()
 {
-  if (reason != NULL)
-    fprintf (stderr, "%s: %s\n", program_name, reason);
-
   fprintf (stderr, "\
 Usage: %s [-benstuvAET] [--number] [--number-nonblank] [--squeeze-blank]\n\
        [--show-nonprinting] [--show-ends] [--show-tabs] [--show-all]\n\
@@ -224,7 +220,7 @@ main (argc, argv)
 	  break;
 
 	default:
-	  usage ((char *) 0);
+	  usage ();
 	}
     }