diff options
| author | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 09:13:01 +0000 |
|---|---|---|
| committer | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 09:13:01 +0000 |
| commit | cad5364599eb5062d59e0c397ed638ddd61a8d5d (patch) | |
| tree | a318d0f03aa076c74b576ea45dc543a5669e8e91 /util-linux/fbset.c | |
| parent | e01f9662a5bd5d91be4f6b3941b57fff73cd5af1 (diff) | |
| download | busybox-cad5364599eb5062d59e0c397ed638ddd61a8d5d.tar.gz | |
Major coreutils update.
Diffstat (limited to 'util-linux/fbset.c')
| -rw-r--r-- | util-linux/fbset.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/util-linux/fbset.c b/util-linux/fbset.c index 9423abc09..afd9e64be 100644 --- a/util-linux/fbset.c +++ b/util-linux/fbset.c @@ -194,7 +194,7 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn, char buf[256]; char *p = buf; - f = xfopen(fn, "r"); + f = bb_xfopen(fn, "r"); while (!feof(f)) { fgets(buf, sizeof(buf), f); if ((p = strstr(buf, "mode ")) || (p = strstr(buf, "mode\t"))) { @@ -279,7 +279,7 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn, } } #else - error_msg( "mode reading not compiled in"); + bb_error_msg( "mode reading not compiled in"); #endif return 0; } @@ -350,7 +350,7 @@ extern int fbset_main(int argc, char **argv) for (i = 0; g_cmdoptions[i].name; i++) { if (!strcmp(thisarg, g_cmdoptions[i].name)) { if (argc - 1 < g_cmdoptions[i].param_count) - show_usage(); + bb_show_usage(); switch (g_cmdoptions[i].code) { case CMD_FB: fbdev = argv[1]; @@ -399,18 +399,18 @@ extern int fbset_main(int argc, char **argv) mode = *argv; g_options |= OPT_READMODE; } else { - show_usage(); + bb_show_usage(); } } } if ((fh = open(fbdev, O_RDONLY)) < 0) - perror_msg_and_die("fbset(open)"); + bb_perror_msg_and_die("fbset(open)"); if (ioctl(fh, FBIOGET_VSCREENINFO, &var)) - perror_msg_and_die("fbset(ioctl)"); + bb_perror_msg_and_die("fbset(ioctl)"); if (g_options & OPT_READMODE) { if (!readmode(&var, modefile, mode)) { - error_msg("Unknown video mode `%s'", mode); + bb_error_msg("Unknown video mode `%s'", mode); return EXIT_FAILURE; } } @@ -418,7 +418,7 @@ extern int fbset_main(int argc, char **argv) setmode(&var, &varset); if (g_options & OPT_CHANGE) if (ioctl(fh, FBIOPUT_VSCREENINFO, &var)) - perror_msg_and_die("fbset(ioctl)"); + bb_perror_msg_and_die("fbset(ioctl)"); showmode(&var); /* Don't close the file, as exiting will take care of that */ /* close(fh); */ |