Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 23:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix warnings about using char as an array subscript. This is not portable

Browse source 
since char is signed on some platforms and unsigned on others.
This commit is contained in:
Neal Norwitz 2008-03-27 04:40:50 +00:00
parent 4ebd46a02d
commit 231346e23f
4 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Include/bytes_methods.h
View file

@ -44,13 +44,13 @@ extern const char _Py_swapcase__doc__[];
extern const unsigned int _Py_ctype_table[256]; extern const unsigned int _Py_ctype_table[256];
#define ISLOWER(c) (_Py_ctype_table[Py_CHARMASK(c)] & FLAG_LOWER) #define ISLOWER(c) (_Py_ctype_table[(unsigned)Py_CHARMASK(c)] & FLAG_LOWER)
#define ISUPPER(c) (_Py_ctype_table[Py_CHARMASK(c)] & FLAG_UPPER) #define ISUPPER(c) (_Py_ctype_table[(unsigned)Py_CHARMASK(c)] & FLAG_UPPER)
#define ISALPHA(c) (_Py_ctype_table[Py_CHARMASK(c)] & FLAG_ALPHA) #define ISALPHA(c) (_Py_ctype_table[(unsigned)Py_CHARMASK(c)] & FLAG_ALPHA)
#define ISDIGIT(c) (_Py_ctype_table[Py_CHARMASK(c)] & FLAG_DIGIT) #define ISDIGIT(c) (_Py_ctype_table[(unsigned)Py_CHARMASK(c)] & FLAG_DIGIT)
#define ISXDIGIT(c) (_Py_ctype_table[Py_CHARMASK(c)] & FLAG_XDIGIT) #define ISXDIGIT(c) (_Py_ctype_table[(unsigned)Py_CHARMASK(c)] & FLAG_XDIGIT)
#define ISALNUM(c) (_Py_ctype_table[Py_CHARMASK(c)] & FLAG_ALNUM) #define ISALNUM(c) (_Py_ctype_table[(unsigned)Py_CHARMASK(c)] & FLAG_ALNUM)
#define ISSPACE(c) (_Py_ctype_table[Py_CHARMASK(c)] & FLAG_SPACE) #define ISSPACE(c) (_Py_ctype_table[(unsigned)Py_CHARMASK(c)] & FLAG_SPACE)
#undef islower #undef islower
#define islower(c) undefined_islower(c) #define islower(c) undefined_islower(c)

10
Objects/longobject.c
View file

@ -1397,7 +1397,7 @@ long_from_binary_base(char **str, int base)
n >>= 1; n >>= 1;
/* n <- total # of bits needed, while setting p to end-of-string */ /* n <- total # of bits needed, while setting p to end-of-string */
n = 0; n = 0;
while (_PyLong_DigitValue[Py_CHARMASK(*p)] < base) while (_PyLong_DigitValue[(unsigned)Py_CHARMASK(*p)] < base)
++p; ++p;
*str = p; *str = p;
/* n <- # of Python digits needed, = ceiling(n/PyLong_SHIFT). */ /* n <- # of Python digits needed, = ceiling(n/PyLong_SHIFT). */
@ -1418,7 +1418,7 @@ long_from_binary_base(char **str, int base)
bits_in_accum = 0; bits_in_accum = 0;
pdigit = z->ob_digit; pdigit = z->ob_digit;
while (--p >= start) { while (--p >= start) {
int k = _PyLong_DigitValue[Py_CHARMASK(*p)]; int k = _PyLong_DigitValue[(unsigned)Py_CHARMASK(*p)];
assert(k >= 0 && k < base); assert(k >= 0 && k < base);
accum |= (twodigits)(k << bits_in_accum); accum |= (twodigits)(k << bits_in_accum);
bits_in_accum += bits_per_char; bits_in_accum += bits_per_char;
@ -1609,7 +1609,7 @@ digit beyond the first.
/* Find length of the string of numeric characters. */ /* Find length of the string of numeric characters. */
scan = str; scan = str;
while (_PyLong_DigitValue[Py_CHARMASK(*scan)] < base) while (_PyLong_DigitValue[(unsigned)Py_CHARMASK(*scan)] < base)
++scan; ++scan;
/* Create a long object that can contain the largest possible /* Create a long object that can contain the largest possible
@ -1635,10 +1635,10 @@ digit beyond the first.
/* Work ;-) */ /* Work ;-) */
while (str < scan) { while (str < scan) {
/* grab up to convwidth digits from the input string */ /* grab up to convwidth digits from the input string */
c = (digit)_PyLong_DigitValue[Py_CHARMASK(*str++)]; c = (digit)_PyLong_DigitValue[(unsigned)Py_CHARMASK(*str++)];
for (i = 1; i < convwidth && str != scan; ++i, ++str) { for (i = 1; i < convwidth && str != scan; ++i, ++str) {
c = (twodigits)(c * base + c = (twodigits)(c * base +
_PyLong_DigitValue[Py_CHARMASK(*str)]); _PyLong_DigitValue[(unsigned)Py_CHARMASK(*str)]);
assert(c < PyLong_BASE); assert(c < PyLong_BASE);
} }

4
Objects/unicodeobject.c
View file

@ -480,13 +480,13 @@ PyObject *PyUnicode_FromStringAndSize(const char *u, Py_ssize_t size)
/* Single characters are shared when using this constructor. /* Single characters are shared when using this constructor.
Restrict to ASCII, since the input must be UTF-8. */ Restrict to ASCII, since the input must be UTF-8. */
if (size == 1 && Py_CHARMASK(*u) < 128) { if (size == 1 && Py_CHARMASK(*u) < 128) {
unicode = unicode_latin1[Py_CHARMASK(*u)]; unicode = unicode_latin1[(unsigned)Py_CHARMASK(*u)];
if (!unicode) { if (!unicode) {
unicode = _PyUnicode_New(1); unicode = _PyUnicode_New(1);
if (!unicode) if (!unicode)
return NULL; return NULL;
unicode->str[0] = Py_CHARMASK(*u); unicode->str[0] = Py_CHARMASK(*u);
unicode_latin1[Py_CHARMASK(*u)] = unicode; unicode_latin1[(unsigned)Py_CHARMASK(*u)] = unicode;
} }
Py_INCREF(unicode); Py_INCREF(unicode);
return (PyObject *)unicode; return (PyObject *)unicode;

16
Python/mystrtoul.c
View file

@ -109,7 +109,7 @@ PyOS_strtoul(register char *str, char **ptr, int base)
++str; ++str;
if (*str == 'x' || *str == 'X') { if (*str == 'x' || *str == 'X') {
/* there must be at least one digit after 0x */ /* there must be at least one digit after 0x */
if (_PyLong_DigitValue[Py_CHARMASK(str[1])] >= 16) { if (_PyLong_DigitValue[(unsigned)Py_CHARMASK(str[1])] >= 16) {
if (ptr) if (ptr)
*ptr = str; *ptr = str;
return 0; return 0;
@ -118,7 +118,7 @@ PyOS_strtoul(register char *str, char **ptr, int base)
base = 16; base = 16;
} else if (*str == 'o' || *str == 'O') { } else if (*str == 'o' || *str == 'O') {
/* there must be at least one digit after 0o */ /* there must be at least one digit after 0o */
if (_PyLong_DigitValue[Py_CHARMASK(str[1])] >= 8) { if (_PyLong_DigitValue[(unsigned)Py_CHARMASK(str[1])] >= 8) {
if (ptr) if (ptr)
*ptr = str; *ptr = str;
return 0; return 0;
@ -127,7 +127,7 @@ PyOS_strtoul(register char *str, char **ptr, int base)
base = 8; base = 8;
} else if (*str == 'b' || *str == 'B') { } else if (*str == 'b' || *str == 'B') {
/* there must be at least one digit after 0b */ /* there must be at least one digit after 0b */
if (_PyLong_DigitValue[Py_CHARMASK(str[1])] >= 2) { if (_PyLong_DigitValue[(unsigned)Py_CHARMASK(str[1])] >= 2) {
if (ptr) if (ptr)
*ptr = str; *ptr = str;
return 0; return 0;
@ -147,7 +147,7 @@ PyOS_strtoul(register char *str, char **ptr, int base)
++str; ++str;
if (*str == 'b' || *str == 'B') { if (*str == 'b' || *str == 'B') {
/* there must be at least one digit after 0b */ /* there must be at least one digit after 0b */
if (_PyLong_DigitValue[Py_CHARMASK(str[1])] >= 2) { if (_PyLong_DigitValue[(unsigned)Py_CHARMASK(str[1])] >= 2) {
if (ptr) if (ptr)
*ptr = str; *ptr = str;
return 0; return 0;
@ -162,7 +162,7 @@ PyOS_strtoul(register char *str, char **ptr, int base)
++str; ++str;
if (*str == 'o' || *str == 'O') { if (*str == 'o' || *str == 'O') {
/* there must be at least one digit after 0o */ /* there must be at least one digit after 0o */
if (_PyLong_DigitValue[Py_CHARMASK(str[1])] >= 8) { if (_PyLong_DigitValue[(unsigned)Py_CHARMASK(str[1])] >= 8) {
if (ptr) if (ptr)
*ptr = str; *ptr = str;
return 0; return 0;
@ -177,7 +177,7 @@ PyOS_strtoul(register char *str, char **ptr, int base)
++str; ++str;
if (*str == 'x' || *str == 'X') { if (*str == 'x' || *str == 'X') {
/* there must be at least one digit after 0x */ /* there must be at least one digit after 0x */
if (_PyLong_DigitValue[Py_CHARMASK(str[1])] >= 16) { if (_PyLong_DigitValue[(unsigned)Py_CHARMASK(str[1])] >= 16) {
if (ptr) if (ptr)
*ptr = str; *ptr = str;
return 0; return 0;
@ -203,7 +203,7 @@ PyOS_strtoul(register char *str, char **ptr, int base)
ovlimit = digitlimit[base]; ovlimit = digitlimit[base];
/* do the conversion until non-digit character encountered */ /* do the conversion until non-digit character encountered */
while ((c = _PyLong_DigitValue[Py_CHARMASK(*str)]) < base) { while ((c = _PyLong_DigitValue[(unsigned)Py_CHARMASK(*str)]) < base) {
if (ovlimit > 0) /* no overflow check required */ if (ovlimit > 0) /* no overflow check required */
result = result * base + c; result = result * base + c;
else { /* requires overflow check */ else { /* requires overflow check */
@ -240,7 +240,7 @@ PyOS_strtoul(register char *str, char **ptr, int base)
overflowed: overflowed:
if (ptr) { if (ptr) {
/* spool through remaining digit characters */ /* spool through remaining digit characters */
while (_PyLong_DigitValue[Py_CHARMASK(*str)] < base) while (_PyLong_DigitValue[(unsigned)Py_CHARMASK(*str)] < base)
++str; ++str;
*ptr = str; *ptr = str;
} }