diff options
author | Matt Kraai <kraai@debian.org> | 2001-01-31 19:00:21 +0000 |
---|---|---|
committer | Matt Kraai <kraai@debian.org> | 2001-01-31 19:00:21 +0000 |
commit | dd19c6990496023fe23fefef8f1798740f7d39c6 (patch) | |
tree | 3933adefa4171173db78fa2389146ac89f4edb86 /console-tools/loadfont.c | |
parent | 63ec2732454a0c973305794e185e488106f6b282 (diff) | |
download | busybox-w32-dd19c6990496023fe23fefef8f1798740f7d39c6.tar.gz busybox-w32-dd19c6990496023fe23fefef8f1798740f7d39c6.tar.bz2 busybox-w32-dd19c6990496023fe23fefef8f1798740f7d39c6.zip |
Removed trailing \n from error_msg{,_and_die} messages.
Diffstat (limited to 'console-tools/loadfont.c')
-rw-r--r-- | console-tools/loadfont.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index 08e07618e..ec3e50560 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c | |||
@@ -62,7 +62,7 @@ static void do_loadfont(int fd, char *inbuf, int unit, int fontsize) | |||
62 | memset(buf, 0, sizeof(buf)); | 62 | memset(buf, 0, sizeof(buf)); |
63 | 63 | ||
64 | if (unit < 1 || unit > 32) | 64 | if (unit < 1 || unit > 32) |
65 | error_msg_and_die("Bad character size %d\n", unit); | 65 | error_msg_and_die("Bad character size %d", unit); |
66 | 66 | ||
67 | for (i = 0; i < fontsize; i++) | 67 | for (i = 0; i < fontsize; i++) |
68 | memcpy(buf + (32 * i), inbuf + (unit * i), unit); | 68 | memcpy(buf + (32 * i), inbuf + (unit * i), unit); |
@@ -119,8 +119,8 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) | |||
119 | if (ioctl(fd, PIO_UNIMAPCLR, &advice)) { | 119 | if (ioctl(fd, PIO_UNIMAPCLR, &advice)) { |
120 | #ifdef ENOIOCTLCMD | 120 | #ifdef ENOIOCTLCMD |
121 | if (errno == ENOIOCTLCMD) { | 121 | if (errno == ENOIOCTLCMD) { |
122 | error_msg("It seems this kernel is older than 1.1.92\n"); | 122 | error_msg("It seems this kernel is older than 1.1.92"); |
123 | error_msg_and_die("No Unicode mapping table loaded.\n"); | 123 | error_msg_and_die("No Unicode mapping table loaded."); |
124 | } else | 124 | } else |
125 | #endif | 125 | #endif |
126 | perror_msg_and_die("PIO_UNIMAPCLR"); | 126 | perror_msg_and_die("PIO_UNIMAPCLR"); |
@@ -174,11 +174,11 @@ static void loadnewfont(int fd) | |||
174 | goto no_psf; | 174 | goto no_psf; |
175 | 175 | ||
176 | if (psfhdr.mode > PSF_MAXMODE) | 176 | if (psfhdr.mode > PSF_MAXMODE) |
177 | error_msg_and_die("Unsupported psf file mode\n"); | 177 | error_msg_and_die("Unsupported psf file mode"); |
178 | fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256); | 178 | fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256); |
179 | #if !defined( PIO_FONTX ) || defined( __sparc__ ) | 179 | #if !defined( PIO_FONTX ) || defined( __sparc__ ) |
180 | if (fontsize != 256) | 180 | if (fontsize != 256) |
181 | error_msg_and_die("Only fontsize 256 supported\n"); | 181 | error_msg_and_die("Only fontsize 256 supported"); |
182 | #endif | 182 | #endif |
183 | hastable = (psfhdr.mode & PSF_MODEHASTAB); | 183 | hastable = (psfhdr.mode & PSF_MODEHASTAB); |
184 | unit = psfhdr.charsize; | 184 | unit = psfhdr.charsize; |
@@ -186,7 +186,7 @@ static void loadnewfont(int fd) | |||
186 | 186 | ||
187 | head = head0 + fontsize * unit; | 187 | head = head0 + fontsize * unit; |
188 | if (head > inputlth || (!hastable && head != inputlth)) | 188 | if (head > inputlth || (!hastable && head != inputlth)) |
189 | error_msg_and_die("Input file: bad length\n"); | 189 | error_msg_and_die("Input file: bad length"); |
190 | do_loadfont(fd, inbuf + head0, unit, fontsize); | 190 | do_loadfont(fd, inbuf + head0, unit, fontsize); |
191 | if (hastable) | 191 | if (hastable) |
192 | do_loadtable(fd, inbuf + head, inputlth - head, fontsize); | 192 | do_loadtable(fd, inbuf + head, inputlth - head, fontsize); |
@@ -201,7 +201,7 @@ static void loadnewfont(int fd) | |||
201 | } else { | 201 | } else { |
202 | /* bare font */ | 202 | /* bare font */ |
203 | if (inputlth & 0377) | 203 | if (inputlth & 0377) |
204 | error_msg_and_die("Bad input file size\n"); | 204 | error_msg_and_die("Bad input file size"); |
205 | offset = 0; | 205 | offset = 0; |
206 | unit = inputlth / 256; | 206 | unit = inputlth / 256; |
207 | } | 207 | } |