ash: some beautification work, no code changes

[oweals/busybox.git] / editors / cmp.c

diff --git a/editors/cmp.c b/editors/cmp.c
index e5dda80ffa30b8992966a03c5ac1daf2b561ac0e..2e98e6e24fc427b6be526ec4803b509af761991c 100644 (file)
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -23,27 +23,17 @@
 
 #include "libbb.h"
 
-static FILE *cmp_xfopen_input(const char *filename)
-{
-       FILE *fp;
-
-       fp = fopen_or_warn_stdin(filename);
-       if (fp)
-               return fp;
-       xfunc_die();    /* We already output an error message. */
-}
-
-static const char fmt_eof[] = "cmp: EOF on %s\n";
-static const char fmt_differ[] = "%s %s differ: char %"OFF_FMT"d, line %d\n";
+static const char fmt_eof[] ALIGN1 = "cmp: EOF on %s\n";
+static const char fmt_differ[] ALIGN1 = "%s %s differ: char %"OFF_FMT"d, line %d\n";
 // This fmt_l_opt uses gnu-isms.  SUSv3 would be "%.0s%.0s%"OFF_FMT"d %o %o\n"
-static const char fmt_l_opt[] = "%.0s%.0s%"OFF_FMT"d %3o %3o\n";
+static const char fmt_l_opt[] ALIGN1 = "%.0s%.0s%"OFF_FMT"d %3o %3o\n";
 
-static const char opt_chars[] = "sl";
+static const char opt_chars[] ALIGN1 = "sl";
 #define CMP_OPT_s (1<<0)
 #define CMP_OPT_l (1<<1)
 
-int cmp_main(int argc, char **argv);
-int cmp_main(int argc, char **argv)
+int cmp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int cmp_main(int argc UNUSED_PARAM, char **argv)
 {
        FILE *fp1, *fp2, *outfile = stdout;
        const char *filename1, *filename2 = "-";
@@ -57,15 +47,15 @@ int cmp_main(int argc, char **argv)
 
        xfunc_error_retval = 2; /* 1 is returned if files are different. */
 
-       opt_complementary = "?:-1"
+       opt_complementary = "-1"
                        USE_DESKTOP(":?4")
                        SKIP_DESKTOP(":?2")
                        ":l--s:s--l";
-       opt = getopt32(argc, argv, opt_chars);
+       opt = getopt32(argv, opt_chars);
        argv += optind;
 
        filename1 = *argv;
-       fp1 = cmp_xfopen_input(filename1);
+       fp1 = xfopen_stdin(filename1);
 
        if (*++argv) {
                filename2 = *argv;
@@ -79,7 +69,7 @@ int cmp_main(int argc, char **argv)
 #endif
        }
 
-       fp2 = cmp_xfopen_input(filename2);
+       fp2 = xfopen_stdin(filename2);
        if (fp1 == fp2) {               /* Paranoia check... stdin == stdin? */
                /* Note that we don't bother reading stdin.  Neither does gnu wc.
                 * But perhaps we should, so that other apps down the chain don't