]>
Commit | Line | Data |
---|---|---|
9b0ff0a0 MT |
1 | Submitted By: Matthew Burgess <matthew@linuxfromscratch.org> |
2 | Date: 2005-07-28 | |
3 | Initial Package Version: 1.12 | |
4 | Upstream Status: Unknown | |
5 | Origin: http://cvs.fedora.redhat.com/viewcvs/devel/kbd/kbd-1.12-alias.patch?rev=1.2&view=markup | |
6 | Description: Fix violations of C aliasing rules, triggered by gcc4. | |
7 | ||
8 | diff -Naur kbd-1.12.orig/src/psffontop.c kbd-1.12/src/psffontop.c | |
9 | --- kbd-1.12.orig/src/psffontop.c 2004-01-16 19:45:31.000000000 +0000 | |
10 | +++ kbd-1.12/src/psffontop.c 2005-07-28 20:33:57.946088984 +0000 | |
11 | @@ -59,7 +59,6 @@ | |
12 | ||
13 | static unsigned int | |
14 | assemble_ucs2(char **inptr, int cnt) { | |
15 | - unsigned char **in = (unsigned char **) inptr; | |
16 | unsigned int u1, u2; | |
17 | ||
18 | if (cnt < 2) { | |
19 | @@ -68,8 +67,8 @@ | |
20 | exit(EX_DATAERR); | |
21 | } | |
22 | ||
23 | - u1 = *(*in)++; | |
24 | - u2 = *(*in)++; | |
25 | + u1 = (unsigned char)*(*inptr)++; | |
26 | + u2 = (unsigned char)*(*inptr)++; | |
27 | return (u1 | (u2 << 8)); | |
28 | } | |
29 | ||
30 | @@ -110,7 +109,6 @@ | |
31 | */ | |
32 | static void | |
33 | get_uni_entry(char **inptr, char **endptr, struct unicode_list *up, int utf8) { | |
34 | - unsigned char **in = (unsigned char **) inptr; | |
35 | unsigned char uc; | |
36 | unicode unichar; | |
37 | int inseq = 0; | |
38 | @@ -126,14 +124,14 @@ | |
39 | exit(EX_DATAERR); | |
40 | } | |
41 | if (utf8) { | |
42 | - uc = *(*in)++; | |
43 | + uc = *(*inptr)++; | |
44 | if (uc == PSF2_SEPARATOR) | |
45 | break; | |
46 | if (uc == PSF2_STARTSEQ) { | |
47 | inseq = 1; | |
48 | continue; | |
49 | } | |
50 | - --(*in); | |
51 | + --(*inptr); | |
52 | unichar = assemble_utf8(inptr, *endptr - *inptr); | |
53 | } else { | |
54 | unichar = assemble_ucs2(inptr, *endptr - *inptr); |