source:
patches/kbd-1.12-gcc4_fixes-1.patch@
f227e7cc
Last change on this file since f227e7cc was 69cde8d, checked in by , 19 years ago | |
---|---|
|
|
File size: 1.4 KB |
-
src/psffontop.c
Submitted By: Matthew Burgess <matthew@linuxfromscratch.org> Date: 2005-07-28 Initial Package Version: 1.12 Upstream Status: Unknown Origin: http://cvs.fedora.redhat.com/viewcvs/devel/kbd/kbd-1.12-alias.patch?rev=1.2&view=markup Description: Fix violations of C aliasing rules, triggered by gcc4. diff -Naur kbd-1.12.orig/src/psffontop.c kbd-1.12/src/psffontop.c
old new 59 59 60 60 static unsigned int 61 61 assemble_ucs2(char **inptr, int cnt) { 62 unsigned char **in = (unsigned char **) inptr;63 62 unsigned int u1, u2; 64 63 65 64 if (cnt < 2) { … … 68 67 exit(EX_DATAERR); 69 68 } 70 69 71 u1 = *(*in)++;72 u2 = *(*in)++;70 u1 = (unsigned char)*(*inptr)++; 71 u2 = (unsigned char)*(*inptr)++; 73 72 return (u1 | (u2 << 8)); 74 73 } 75 74 … … 110 109 */ 111 110 static void 112 111 get_uni_entry(char **inptr, char **endptr, struct unicode_list *up, int utf8) { 113 unsigned char **in = (unsigned char **) inptr;114 112 unsigned char uc; 115 113 unicode unichar; 116 114 int inseq = 0; … … 126 124 exit(EX_DATAERR); 127 125 } 128 126 if (utf8) { 129 uc = *(*in )++;127 uc = *(*inptr)++; 130 128 if (uc == PSF2_SEPARATOR) 131 129 break; 132 130 if (uc == PSF2_STARTSEQ) { 133 131 inseq = 1; 134 132 continue; 135 133 } 136 --(*in );134 --(*inptr); 137 135 unichar = assemble_utf8(inptr, *endptr - *inptr); 138 136 } else { 139 137 unichar = assemble_ucs2(inptr, *endptr - *inptr);
Note:
See TracBrowser
for help on using the repository browser.