yann@1
|
1 |
Fixes
|
yann@1
|
2 |
gconv_open.c: In function `__gconv_open':
|
yann@1
|
3 |
gconv_open.c:186: error: invalid lvalue in assignment
|
yann@1
|
4 |
when building glibc-2.2.5 with gcc-4.0.
|
yann@1
|
5 |
Same as ../glibc-2.3.2/glibc-2.3.2-allow-gcc-3.5-gconv.patch
|
yann@1
|
6 |
but rediffed against glibc-2.2.5.
|
yann@1
|
7 |
|
yann@1
|
8 |
wget 'http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/iconv/gconv_simple.c.diff?r1=1.59&r2=1.63&cvsroot=glibc'
|
yann@1
|
9 |
* (internal_ucs4_loop): Fix typo in last change.
|
yann@1
|
10 |
|
yann@1
|
11 |
* (internal_ucs4le_loop): Remove cast used as lvalue.
|
yann@1
|
12 |
|
yann@1
|
13 |
* Fix last commit.
|
yann@1
|
14 |
|
yann@1
|
15 |
* iconv/gconv_simple.c (ucs4le_internal_loop): Remove cast used as lvalue.
|
yann@1
|
16 |
(internal_ucs4le_loop_single): Likewise.
|
yann@1
|
17 |
(ucs4_internal_loop): Likewise.
|
yann@1
|
18 |
(BODY): Likewise.
|
yann@1
|
19 |
(internal_ucs4_loop_single): Likewise.
|
yann@1
|
20 |
|
yann@1
|
21 |
wget 'http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/iconv/gconv_open.c.diff?r1=1.32&r2=1.33&cvsroot=glibc'
|
yann@1
|
22 |
* iconv/gconv_simple.c (ucs4le_internal_loop): Remove cast used as lvalue.
|
yann@1
|
23 |
(internal_ucs4le_loop_single): Likewise.
|
yann@1
|
24 |
(ucs4_internal_loop): Likewise.
|
yann@1
|
25 |
(BODY): Likewise.
|
yann@1
|
26 |
(internal_ucs4_loop_single): Likewise.
|
yann@1
|
27 |
|
yann@1
|
28 |
|
yann@1
|
29 |
===================================================================
|
yann@1
|
30 |
RCS file: /cvs/glibc/libc/iconv/gconv_open.c,v
|
yann@1
|
31 |
retrieving revision 1.32
|
yann@1
|
32 |
retrieving revision 1.33
|
yann@1
|
33 |
diff -u -r1.32 -r1.33
|
yann@1
|
34 |
--- libc/iconv/gconv_open.c 2001/11/29 04:51:58 1.32
|
yann@1
|
35 |
+++ libc/iconv/gconv_open.c 2004/02/07 15:56:32 1.33
|
yann@1
|
36 |
@@ -1,5 +1,5 @@
|
yann@1
|
37 |
/* Find matching transformation algorithms and initialize steps.
|
yann@1
|
38 |
- Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
|
yann@1
|
39 |
+ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
|
yann@1
|
40 |
This file is part of the GNU C Library.
|
yann@1
|
41 |
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
yann@1
|
42 |
|
yann@1
|
43 |
@@ -182,8 +182,13 @@
|
yann@1
|
44 |
|| __builtin_expect (__gconv_translit_find (runp), 0) == 0)
|
yann@1
|
45 |
lastp = runp;
|
yann@1
|
46 |
else
|
yann@1
|
47 |
- /* This means we haven't found the module. Remove it. */
|
yann@1
|
48 |
- (lastp == NULL ? trans : lastp->next) = runp->next;
|
yann@1
|
49 |
+ {
|
yann@1
|
50 |
+ /* This means we haven't found the module. Remove it. */
|
yann@1
|
51 |
+ if (lastp == NULL)
|
yann@1
|
52 |
+ trans = runp->next;
|
yann@1
|
53 |
+ else
|
yann@1
|
54 |
+ lastp->next = runp->next;
|
yann@1
|
55 |
+ }
|
yann@1
|
56 |
}
|
yann@1
|
57 |
|
yann@1
|
58 |
/* Allocate room for handle. */
|
yann@1
|
59 |
===================================================================
|
yann@1
|
60 |
--- glibc-2.2.5/iconv/gconv_simple.c.old 2001-08-03 15:06:46.000000000 -0700
|
yann@1
|
61 |
+++ glibc-2.2.5/iconv/gconv_simple.c 2005-03-10 00:49:45.558181608 -0800
|
yann@1
|
62 |
@@ -1,5 +1,5 @@
|
yann@1
|
63 |
/* Simple transformations functions.
|
yann@1
|
64 |
- Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
|
yann@1
|
65 |
+ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
|
yann@1
|
66 |
This file is part of the GNU C Library.
|
yann@1
|
67 |
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
yann@1
|
68 |
|
yann@1
|
69 |
@@ -73,12 +73,13 @@
|
yann@1
|
70 |
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
yann@1
|
71 |
/* Sigh, we have to do some real work. */
|
yann@1
|
72 |
size_t cnt;
|
yann@1
|
73 |
+ uint32_t *outptr32 = (uint32_t *) outptr;
|
yann@1
|
74 |
|
yann@1
|
75 |
for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4)
|
yann@1
|
76 |
- *((uint32_t *) outptr)++ = bswap_32 (*(const uint32_t *) inptr);
|
yann@1
|
77 |
+ *outptr32++ = bswap_32 (*(const uint32_t *) inptr);
|
yann@1
|
78 |
|
yann@1
|
79 |
*inptrp = inptr;
|
yann@1
|
80 |
- *outptrp = outptr;
|
yann@1
|
81 |
+ *outptrp = (unsigned char *) outptr32;
|
yann@1
|
82 |
#elif __BYTE_ORDER == __BIG_ENDIAN
|
yann@1
|
83 |
/* Simply copy the data. */
|
yann@1
|
84 |
*inptrp = inptr + n_convert * 4;
|
yann@1
|
85 |
@@ -176,13 +177,16 @@
|
yann@1
|
86 |
(*outptrp)[2] = state->__value.__wchb[1];
|
yann@1
|
87 |
(*outptrp)[3] = state->__value.__wchb[0];
|
yann@1
|
88 |
|
yann@1
|
89 |
- *outptrp += 4;
|
yann@1
|
90 |
#elif __BYTE_ORDER == __BIG_ENDIAN
|
yann@1
|
91 |
/* XXX unaligned */
|
yann@1
|
92 |
- *(*((uint32_t **) outptrp)++) = state->__value.__wch;
|
yann@1
|
93 |
+ (*outptrp)[0] = state->__value.__wchb[0];
|
yann@1
|
94 |
+ (*outptrp)[1] = state->__value.__wchb[1];
|
yann@1
|
95 |
+ (*outptrp)[2] = state->__value.__wchb[2];
|
yann@1
|
96 |
+ (*outptrp)[3] = state->__value.__wchb[3];
|
yann@1
|
97 |
#else
|
yann@1
|
98 |
# error "This endianess is not supported."
|
yann@1
|
99 |
#endif
|
yann@1
|
100 |
+ *outptrp += 4;
|
yann@1
|
101 |
|
yann@1
|
102 |
/* Clear the state buffer. */
|
yann@1
|
103 |
state->__count &= ~7;
|
yann@1
|
104 |
@@ -251,7 +255,8 @@
|
yann@1
|
105 |
return __GCONV_ILLEGAL_INPUT;
|
yann@1
|
106 |
}
|
yann@1
|
107 |
|
yann@1
|
108 |
- *((uint32_t *) outptr)++ = inval;
|
yann@1
|
109 |
+ *((uint32_t *) outptr) = inval;
|
yann@1
|
110 |
+ outptr += sizeof (uint32_t);
|
yann@1
|
111 |
}
|
yann@1
|
112 |
|
yann@1
|
113 |
*inptrp = inptr;
|
yann@1
|
114 |
@@ -427,9 +432,11 @@
|
yann@1
|
115 |
#if __BYTE_ORDER == __BIG_ENDIAN
|
yann@1
|
116 |
/* Sigh, we have to do some real work. */
|
yann@1
|
117 |
size_t cnt;
|
yann@1
|
118 |
+ uint32_t *outptr32 = (uint32_t *) outptr;
|
yann@1
|
119 |
|
yann@1
|
120 |
for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4)
|
yann@1
|
121 |
- *((uint32_t *) outptr)++ = bswap_32 (*(const uint32_t *) inptr);
|
yann@1
|
122 |
+ *outptr32++ = bswap_32 (*(const uint32_t *) inptr);
|
yann@1
|
123 |
+ outptr = (unsigned char *) outptr32;
|
yann@1
|
124 |
|
yann@1
|
125 |
*inptrp = inptr;
|
yann@1
|
126 |
*outptrp = outptr;
|
yann@1
|
127 |
@@ -530,12 +537,17 @@
|
yann@1
|
128 |
(*outptrp)[2] = state->__value.__wchb[1];
|
yann@1
|
129 |
(*outptrp)[3] = state->__value.__wchb[0];
|
yann@1
|
130 |
|
yann@1
|
131 |
- *outptrp += 4;
|
yann@1
|
132 |
#else
|
yann@1
|
133 |
/* XXX unaligned */
|
yann@1
|
134 |
- *(*((uint32_t **) outptrp)++) = state->__value.__wch;
|
yann@1
|
135 |
+ (*outptrp)[0] = state->__value.__wchb[0];
|
yann@1
|
136 |
+ (*outptrp)[1] = state->__value.__wchb[1];
|
yann@1
|
137 |
+ (*outptrp)[2] = state->__value.__wchb[2];
|
yann@1
|
138 |
+ (*outptrp)[3] = state->__value.__wchb[3];
|
yann@1
|
139 |
+
|
yann@1
|
140 |
#endif
|
yann@1
|
141 |
|
yann@1
|
142 |
+ *outptrp += 4;
|
yann@1
|
143 |
+
|
yann@1
|
144 |
/* Clear the state buffer. */
|
yann@1
|
145 |
state->__count &= ~7;
|
yann@1
|
146 |
|
yann@1
|
147 |
@@ -600,7 +612,8 @@
|
yann@1
|
148 |
return __GCONV_ILLEGAL_INPUT;
|
yann@1
|
149 |
}
|
yann@1
|
150 |
|
yann@1
|
151 |
- *((uint32_t *) outptr)++ = inval;
|
yann@1
|
152 |
+ *((uint32_t *) outptr) = inval;
|
yann@1
|
153 |
+ outptr += sizeof (uint32_t);
|
yann@1
|
154 |
}
|
yann@1
|
155 |
|
yann@1
|
156 |
*inptrp = inptr;
|
yann@1
|
157 |
@@ -782,7 +795,8 @@
|
yann@1
|
158 |
} \
|
yann@1
|
159 |
else \
|
yann@1
|
160 |
/* It's an one byte sequence. */ \
|
yann@1
|
161 |
- *((uint32_t *) outptr)++ = *inptr++; \
|
yann@1
|
162 |
+ *((uint32_t *) outptr) = *inptr++; \
|
yann@1
|
163 |
+ outptr += sizeof (uint32_t); \
|
yann@1
|
164 |
}
|
yann@1
|
165 |
#define LOOP_NEED_FLAGS
|
yann@1
|
166 |
#include <iconv/loop.c>
|
yann@1
|
167 |
@@ -812,7 +826,8 @@
|
yann@1
|
168 |
} \
|
yann@1
|
169 |
else \
|
yann@1
|
170 |
/* It's an one byte sequence. */ \
|
yann@1
|
171 |
- *outptr++ = *((const uint32_t *) inptr)++; \
|
yann@1
|
172 |
+ *outptr++ = *((const uint32_t *) inptr); \
|
yann@1
|
173 |
+ inptr += sizeof (uint32_t); \
|
yann@1
|
174 |
}
|
yann@1
|
175 |
#define LOOP_NEED_FLAGS
|
yann@1
|
176 |
#include <iconv/loop.c>
|
yann@1
|
177 |
@@ -1031,7 +1046,8 @@
|
yann@1
|
178 |
} \
|
yann@1
|
179 |
\
|
yann@1
|
180 |
/* Now adjust the pointers and store the result. */ \
|
yann@1
|
181 |
- *((uint32_t *) outptr)++ = ch; \
|
yann@1
|
182 |
+ *((uint32_t *) outptr) = ch; \
|
yann@1
|
183 |
+ outptr += sizeof (uint32_t); \
|
yann@1
|
184 |
}
|
yann@1
|
185 |
#define LOOP_NEED_FLAGS
|
yann@1
|
186 |
|
yann@1
|
187 |
@@ -1174,7 +1190,8 @@
|
yann@1
|
188 |
continue; \
|
yann@1
|
189 |
} \
|
yann@1
|
190 |
\
|
yann@1
|
191 |
- *((uint32_t *) outptr)++ = u1; \
|
yann@1
|
192 |
+ *((uint32_t *) outptr) = u1; \
|
yann@1
|
193 |
+ outptr += sizeof (uint32_t); \
|
yann@1
|
194 |
inptr += 2; \
|
yann@1
|
195 |
}
|
yann@1
|
196 |
#define LOOP_NEED_FLAGS
|
yann@1
|
197 |
@@ -1224,7 +1241,8 @@
|
yann@1
|
198 |
} \
|
yann@1
|
199 |
else \
|
yann@1
|
200 |
{ \
|
yann@1
|
201 |
- *((uint16_t *) outptr)++ = val; \
|
yann@1
|
202 |
+ *((uint16_t *) outptr) = val; \
|
yann@1
|
203 |
+ outptr += sizeof (uint16_t); \
|
yann@1
|
204 |
inptr += 4; \
|
yann@1
|
205 |
} \
|
yann@1
|
206 |
}
|
yann@1
|
207 |
@@ -1265,7 +1283,8 @@
|
yann@1
|
208 |
continue; \
|
yann@1
|
209 |
} \
|
yann@1
|
210 |
\
|
yann@1
|
211 |
- *((uint32_t *) outptr)++ = u1; \
|
yann@1
|
212 |
+ *((uint32_t *) outptr) = u1; \
|
yann@1
|
213 |
+ outptr += sizeof (uint32_t); \
|
yann@1
|
214 |
inptr += 2; \
|
yann@1
|
215 |
}
|
yann@1
|
216 |
#define LOOP_NEED_FLAGS
|
yann@1
|
217 |
@@ -1314,7 +1333,8 @@
|
yann@1
|
218 |
} \
|
yann@1
|
219 |
else \
|
yann@1
|
220 |
{ \
|
yann@1
|
221 |
- *((uint16_t *) outptr)++ = bswap_16 (val); \
|
yann@1
|
222 |
+ *((uint16_t *) outptr) = bswap_16 (val); \
|
yann@1
|
223 |
+ outptr += sizeof (uint16_t); \
|
yann@1
|
224 |
inptr += 4; \
|
yann@1
|
225 |
} \
|
yann@1
|
226 |
}
|