Annotation of /trunk/kbd/patches/kbd-1.12-alias.patch
Parent Directory | Revision Log
Revision 144 -
(hide annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 1129 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 1129 byte(s)
-import
1 | niro | 144 | diff -u kbd-1.12/src/psffontop.c kbd-1.12/src/psffontop.c |
2 | --- kbd-1.12/src/psffontop.c 2005-03-12 00:48:30.075310872 +0100 | ||
3 | +++ kbd-1.12/src/psffontop.c 2005-05-14 10:49:59.000000000 +0900 | ||
4 | @@ -59,7 +59,6 @@ | ||
5 | |||
6 | static unsigned int | ||
7 | assemble_ucs2(char **inptr, int cnt) { | ||
8 | - unsigned char **in = (unsigned char **) inptr; | ||
9 | unsigned int u1, u2; | ||
10 | |||
11 | if (cnt < 2) { | ||
12 | @@ -68,8 +67,8 @@ | ||
13 | exit(EX_DATAERR); | ||
14 | } | ||
15 | |||
16 | - u1 = *(*in)++; | ||
17 | - u2 = *(*in)++; | ||
18 | + u1 = (unsigned char)*(*inptr)++; | ||
19 | + u2 = (unsigned char)*(*inptr)++; | ||
20 | return (u1 | (u2 << 8)); | ||
21 | } | ||
22 | |||
23 | @@ -110,7 +109,6 @@ | ||
24 | */ | ||
25 | static void | ||
26 | get_uni_entry(char **inptr, char **endptr, struct unicode_list *up, int utf8) { | ||
27 | - unsigned char **in = (unsigned char **) inptr; | ||
28 | unsigned char uc; | ||
29 | unicode unichar; | ||
30 | int inseq = 0; | ||
31 | @@ -126,14 +124,14 @@ | ||
32 | exit(EX_DATAERR); | ||
33 | } | ||
34 | if (utf8) { | ||
35 | - uc = *(*in)++; | ||
36 | + uc = *(*inptr)++; | ||
37 | if (uc == PSF2_SEPARATOR) | ||
38 | break; | ||
39 | if (uc == PSF2_STARTSEQ) { | ||
40 | inseq = 1; | ||
41 | continue; | ||
42 | } | ||
43 | - --(*in); | ||
44 | + --(*inptr); | ||
45 | unichar = assemble_utf8(inptr, *endptr - *inptr); | ||
46 | } else { | ||
47 | unichar = assemble_ucs2(inptr, *endptr - *inptr); |