diff options
Diffstat (limited to 'console-tools')
| -rw-r--r-- | console-tools/loadfont.c | 20 | ||||
| -rw-r--r-- | console-tools/loadkmap.c | 2 | ||||
| -rw-r--r-- | console-tools/openvt.c | 4 | ||||
| -rw-r--r-- | console-tools/showkey.c | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index b5d4e8f43..caad7d9ac 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c @@ -225,7 +225,7 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize, if (unicode == PSF2_SEPARATOR) { break; } else if (unicode == PSF2_STARTSEQ) { - bb_error_msg_and_die("unicode sequences not implemented"); + bb_simple_error_msg_and_die("unicode sequences not implemented"); } else if (unicode >= 0xC0) { if (unicode >= 0xFC) unicode &= 0x01, maxct = 5; @@ -239,12 +239,12 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize, unicode &= 0x1F, maxct = 1; do { if (tailsz <= 0 || *inbuf < 0x80 || *inbuf > 0xBF) - bb_error_msg_and_die("illegal UTF-8 character"); + bb_simple_error_msg_and_die("illegal UTF-8 character"); --tailsz; unicode = (unicode << 6) + (*inbuf++ & 0x3F); } while (--maxct > 0); } else if (unicode >= 0x80) { - bb_error_msg_and_die("illegal UTF-8 character"); + bb_simple_error_msg_and_die("illegal UTF-8 character"); } #else return; @@ -281,7 +281,7 @@ static void do_load(int fd, unsigned char *buffer, size_t len) if (len >= sizeof(struct psf1_header) && PSF1_MAGIC_OK(psf1h(buffer))) { if (psf1h(buffer)->mode > PSF1_MAXMODE) - bb_error_msg_and_die("unsupported psf file mode"); + bb_simple_error_msg_and_die("unsupported psf file mode"); if (psf1h(buffer)->mode & PSF1_MODE512) fontsize = 512; if (psf1h(buffer)->mode & PSF1_MODEHASTAB) @@ -292,7 +292,7 @@ static void do_load(int fd, unsigned char *buffer, size_t len) #if ENABLE_FEATURE_LOADFONT_PSF2 if (len >= sizeof(struct psf2_header) && PSF2_MAGIC_OK(psf2h(buffer))) { if (psf2h(buffer)->version > PSF2_MAXVERSION) - bb_error_msg_and_die("unsupported psf file version"); + bb_simple_error_msg_and_die("unsupported psf file version"); fontsize = psf2h(buffer)->length; if (psf2h(buffer)->flags & PSF2_HAS_UNICODE_TABLE) has_table = 2; @@ -311,19 +311,19 @@ static void do_load(int fd, unsigned char *buffer, size_t len) } else #endif { - bb_error_msg_and_die("input file: bad length or unsupported font type"); + bb_simple_error_msg_and_die("input file: bad length or unsupported font type"); } #if !defined(PIO_FONTX) || defined(__sparc__) if (fontsize != 256) - bb_error_msg_and_die("only fontsize 256 supported"); + bb_simple_error_msg_and_die("only fontsize 256 supported"); #endif table = font + fontsize * charsize; buffer += len; if (table > buffer || (!has_table && table != buffer)) - bb_error_msg_and_die("input file: bad length"); + bb_simple_error_msg_and_die("input file: bad length"); do_loadfont(fd, font, height, width, charsize, fontsize); @@ -361,7 +361,7 @@ int loadfont_main(int argc UNUSED_PARAM, char **argv) buffer = xmalloc_read(STDIN_FILENO, &len); // xmalloc_open_zipped_read_close(filename, &len); if (!buffer) - bb_perror_msg_and_die("error reading input font"); + bb_simple_perror_msg_and_die("error reading input font"); do_load(get_console_fd_or_die(), buffer, len); return EXIT_SUCCESS; @@ -502,7 +502,7 @@ int setfont_main(int argc UNUSED_PARAM, char **argv) if (a < 0 || a >= E_TABSZ || b < 0 || b > 65535 ) { - bb_error_msg_and_die("map format"); + bb_simple_error_msg_and_die("map format"); } // patch map unicodes[a] = b; diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c index d4981ad21..91ef50884 100644 --- a/console-tools/loadkmap.c +++ b/console-tools/loadkmap.c @@ -69,7 +69,7 @@ int loadkmap_main(int argc UNUSED_PARAM, char **argv) xread(STDIN_FILENO, flags, 7); if (!is_prefixed_with(flags, BINARY_KEYMAP_MAGIC)) - bb_error_msg_and_die("not a valid binary keymap"); + bb_simple_error_msg_and_die("not a valid binary keymap"); xread(STDIN_FILENO, flags, MAX_NR_KEYMAPS); diff --git a/console-tools/openvt.c b/console-tools/openvt.c index b01229a56..9e6cffecc 100644 --- a/console-tools/openvt.c +++ b/console-tools/openvt.c @@ -87,7 +87,7 @@ static int get_vt_fd(void) fd = open(DEV_CONSOLE, O_RDONLY | O_NONBLOCK); if (fd >= 0 && !not_vt_fd(fd)) return fd; - bb_error_msg_and_die("can't find open VT"); + bb_simple_error_msg_and_die("can't find open VT"); } static int find_free_vtno(void) @@ -98,7 +98,7 @@ static int find_free_vtno(void) errno = 0; /*xfunc_error_retval = 3; - do we need compat? */ if (ioctl(fd, VT_OPENQRY, &vtno) != 0 || vtno <= 0) - bb_perror_msg_and_die("can't find open VT"); + bb_simple_perror_msg_and_die("can't find open VT"); // Not really needed, grep for DAEMON_CLOSE_EXTRA_FDS // if (fd > 2) // close(fd); diff --git a/console-tools/showkey.c b/console-tools/showkey.c index c322ce99d..8f0e9d938 100644 --- a/console-tools/showkey.c +++ b/console-tools/showkey.c @@ -56,7 +56,7 @@ static void xset1(struct termios *t) { int ret = tcsetattr(STDIN_FILENO, TCSAFLUSH, t); if (ret) { - bb_perror_msg("can't tcsetattr for stdin"); + bb_simple_perror_msg("can't tcsetattr for stdin"); } } |