traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix gcc 3.3 warnings related to Py_UNICODE_WIDE.

This commit is contained in:
Hye-Shik Chang 2003-12-29 01:36:01 +00:00
parent f1ca7f561c
commit 7db07e6972
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Objects/unicodectype.c
View File

@ -36,9 +36,12 @@ gettyperecord(Py_UNICODE code)
{ {
int index; int index;
#ifdef Py_UNICODE_WIDE
if (code >= 0x110000) if (code >= 0x110000)
index = 0; index = 0;
else { else
#endif
{
index = index1[(code>>SHIFT)]; index = index1[(code>>SHIFT)];
index = index2[(index<<SHIFT)+(code&((1<<SHIFT)-1))]; index = index2[(index<<SHIFT)+(code&((1<<SHIFT)-1))];
} }

22
Python/codecs.c
View File

@ -563,12 +563,17 @@ PyObject *PyCodec_XMLCharRefReplaceErrors(PyObject *exc)
ressize += 2+3+1; ressize += 2+3+1;
else if (*p<10000) else if (*p<10000)
ressize += 2+4+1; ressize += 2+4+1;
#ifndef Py_UNICODE_WIDE
else
ressize += 2+5+1;
#else
else if (*p<100000) else if (*p<100000)
ressize += 2+5+1; ressize += 2+5+1;
else if (*p<1000000) else if (*p<1000000)
ressize += 2+6+1; ressize += 2+6+1;
else else
ressize += 2+7+1; ressize += 2+7+1;
#endif
} }
/* allocate replacement */ /* allocate replacement */
res = PyUnicode_FromUnicode(NULL, ressize); res = PyUnicode_FromUnicode(NULL, ressize);
@ -600,6 +605,12 @@ PyObject *PyCodec_XMLCharRefReplaceErrors(PyObject *exc)
digits = 4; digits = 4;
base = 1000; base = 1000;
} }
#ifndef Py_UNICODE_WIDE
else {
digits = 5;
base = 10000;
}
#else
else if (*p<100000) { else if (*p<100000) {
digits = 5; digits = 5;
base = 10000; base = 10000;
@ -612,6 +623,7 @@ PyObject *PyCodec_XMLCharRefReplaceErrors(PyObject *exc)
digits = 7; digits = 7;
base = 1000000; base = 1000000;
} }
#endif
while (digits-->0) { while (digits-->0) {
*outp++ = '0' + c/base; *outp++ = '0' + c/base;
c %= base; c %= base;
@ -655,9 +667,12 @@ PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc)
return NULL; return NULL;
startp = PyUnicode_AS_UNICODE(object); startp = PyUnicode_AS_UNICODE(object);
for (p = startp+start, ressize = 0; p < startp+end; ++p) { for (p = startp+start, ressize = 0; p < startp+end; ++p) {
#ifdef Py_UNICODE_WIDE
if (*p >= 0x00010000) if (*p >= 0x00010000)
ressize += 1+1+8; ressize += 1+1+8;
else if (*p >= 0x100) { else
#endif
if (*p >= 0x100) {
ressize += 1+1+4; ressize += 1+1+4;
} }
else else
@ -670,6 +685,7 @@ PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc)
p < startp+end; ++p) { p < startp+end; ++p) {
Py_UNICODE c = *p; Py_UNICODE c = *p;
*outp++ = '\\'; *outp++ = '\\';
#ifdef Py_UNICODE_WIDE
if (c >= 0x00010000) { if (c >= 0x00010000) {
*outp++ = 'U'; *outp++ = 'U';
*outp++ = hexdigits[(c>>28)&0xf]; *outp++ = hexdigits[(c>>28)&0xf];
@ -679,7 +695,9 @@ PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc)
*outp++ = hexdigits[(c>>12)&0xf]; *outp++ = hexdigits[(c>>12)&0xf];
*outp++ = hexdigits[(c>>8)&0xf]; *outp++ = hexdigits[(c>>8)&0xf];
} }
else if (c >= 0x100) { else
#endif
if (c >= 0x100) {
*outp++ = 'u'; *outp++ = 'u';
*outp++ = hexdigits[(c>>12)&0xf]; *outp++ = hexdigits[(c>>12)&0xf];
*outp++ = hexdigits[(c>>8)&0xf]; *outp++ = hexdigits[(c>>8)&0xf];