diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-19 20:32:02 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-19 20:32:02 +0000 |
commit | 28703015ab71784f40bc97f720ed900e26bd03ca (patch) | |
tree | ff0f9a21d1822c9a2f35819db4156d9555f56116 /console-tools/loadfont.c | |
parent | f58906b6463436f6a19f72d43c3ab4ba69d79104 (diff) | |
download | busybox-w32-28703015ab71784f40bc97f720ed900e26bd03ca.tar.gz busybox-w32-28703015ab71784f40bc97f720ed900e26bd03ca.tar.bz2 busybox-w32-28703015ab71784f40bc97f720ed900e26bd03ca.zip |
u_short, ulong exterminated
fdiskXXX: add a bit of sanity (not enough by far)
Diffstat (limited to 'console-tools/loadfont.c')
-rw-r--r-- | console-tools/loadfont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index 5a05876c2..36f0e6da9 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c | |||
@@ -81,14 +81,14 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) | |||
81 | struct unipair *up; | 81 | struct unipair *up; |
82 | int ct = 0, maxct; | 82 | int ct = 0, maxct; |
83 | int glyph; | 83 | int glyph; |
84 | u_short unicode; | 84 | uint16_t unicode; |
85 | 85 | ||
86 | maxct = tailsz; /* more than enough */ | 86 | maxct = tailsz; /* more than enough */ |
87 | up = (struct unipair *) xmalloc(maxct * sizeof(struct unipair)); | 87 | up = (struct unipair *) xmalloc(maxct * sizeof(struct unipair)); |
88 | 88 | ||
89 | for (glyph = 0; glyph < fontsize; glyph++) { | 89 | for (glyph = 0; glyph < fontsize; glyph++) { |
90 | while (tailsz >= 2) { | 90 | while (tailsz >= 2) { |
91 | unicode = (((u_short) inbuf[1]) << 8) + inbuf[0]; | 91 | unicode = (((uint16_t) inbuf[1]) << 8) + inbuf[0]; |
92 | tailsz -= 2; | 92 | tailsz -= 2; |
93 | inbuf += 2; | 93 | inbuf += 2; |
94 | if (unicode == PSF_SEPARATOR) | 94 | if (unicode == PSF_SEPARATOR) |