Fixed 'ls -s' so it actually displays block sizes again.

[oweals/busybox.git] / dmesg.c

diff --git a/dmesg.c b/dmesg.c
index c21f84c9a02cb6e9bd8347bde2c6bb4c7ccb0d1c..47f9f4474a245235009685db4e8b3a5aa4ab63c7 100644 (file)
--- a/dmesg.c
+++ b/dmesg.c
@@ -53,21 +53,21 @@ int dmesg_main(int argc, char **argv)
                case 'n':
                        cmd = 8;
                        if (optarg == NULL)
-                               usage(dmesg_usage);
+                               show_usage();
                        level = atoi(optarg);
                        break;
                case 's':
                        if (optarg == NULL)
-                               usage(dmesg_usage);
+                               show_usage();
                        bufsize = atoi(optarg);
                        break;
                default:
-                       usage(dmesg_usage);
+                       show_usage();
                }
        }                       
 
        if (optind < argc) {
-               goto end;
+               show_usage();
        }
 
        if (cmd == 8) {
@@ -97,7 +97,4 @@ int dmesg_main(int argc, char **argv)
        if (lastc != '\n')
                putchar('\n');
        return EXIT_SUCCESS;
-  end:
-       usage(dmesg_usage);
-       return EXIT_FAILURE;
 }