From 28703015ab71784f40bc97f720ed900e26bd03ca Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Tue, 19 Dec 2006 20:32:02 +0000 Subject: u_short, ulong exterminated fdiskXXX: add a bit of sanity (not enough by far) --- console-tools/loadfont.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'console-tools/loadfont.c') 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) struct unipair *up; int ct = 0, maxct; int glyph; - u_short unicode; + uint16_t unicode; maxct = tailsz; /* more than enough */ up = (struct unipair *) xmalloc(maxct * sizeof(struct unipair)); for (glyph = 0; glyph < fontsize; glyph++) { while (tailsz >= 2) { - unicode = (((u_short) inbuf[1]) << 8) + inbuf[0]; + unicode = (((uint16_t) inbuf[1]) << 8) + inbuf[0]; tailsz -= 2; inbuf += 2; if (unicode == PSF_SEPARATOR) -- cgit v1.2.3