Remove debugging statement.

[oweals/busybox.git] / fbset.c

diff --git a/fbset.c b/fbset.c
index 9acabbecb2ea4629fe0ce2d3b1f66708df8ec555..41c7f9796eb3ed633f09c5a8393b659faf1a37b4 100644 (file)
--- a/fbset.c
+++ b/fbset.c
@@ -24,7 +24,6 @@
  *     Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be)
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -33,6 +32,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include "busybox.h"
 
 #define DEFAULTFBDEV  "/dev/fb0"
 #define DEFAULTFBMODE "/etc/fb.modes"
@@ -42,7 +42,6 @@ static const int OPT_INFO     = (1 << 1);
 static const int OPT_READMODE = (1 << 2);
 
 enum {
-       CMD_HELP = 0,
        CMD_FB = 1,
        CMD_DB = 2,
        CMD_GEOMETRY = 3,
@@ -132,13 +131,12 @@ struct fb_var_screeninfo {
 };
 
 
-struct cmdoptions_t {
+static struct cmdoptions_t {
        char *name;
        unsigned char param_count;
        unsigned char code;
 } g_cmdoptions[] = {
        {
-       "-h", 0, CMD_HELP}, {
        "-fb", 1, CMD_FB}, {
        "-db", 1, CMD_DB}, {
        "-a", 0, CMD_ALL}, {
@@ -150,10 +148,8 @@ struct cmdoptions_t {
        "-vsync", 1, CMD_VSYNC}, {
        "-laced", 1, CMD_LACED}, {
        "-double", 1, CMD_DOUBLE}, {
-       "-help", 0, CMD_HELP}, {
        "-n", 0, CMD_CHANGE}, {
 #ifdef BB_FEATURE_FBSET_FANCY
-       "-help", 0, CMD_HELP}, {
        "-all", 0, CMD_ALL}, {
        "-xres", 1, CMD_XRES}, {
        "-yres", 1, CMD_YRES}, {
@@ -198,8 +194,7 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
        char buf[256];
        char *p = buf;
 
-       if ((f = fopen(fn, "r")) == NULL)
-               perror_msg_and_die("readmode(fopen)");
+       f = xfopen(fn, "r");
        while (!feof(f)) {
                fgets(buf, sizeof(buf), f);
                if ((p = strstr(buf, "mode ")) || (p = strstr(buf, "mode\t"))) {
@@ -357,8 +352,6 @@ extern int fbset_main(int argc, char **argv)
                                if (argc - 1 < g_cmdoptions[i].param_count)
                                        show_usage();
                                switch (g_cmdoptions[i].code) {
-                               case CMD_HELP:
-                                       show_usage();
                                case CMD_FB:
                                        fbdev = argv[1];
                                        break;