mirror of
https://github.com/python/cpython.git
synced 2025-07-28 05:34:31 +00:00
Remove compiler warnings (on Alpha at least) about using chars as
array subscripts. Using chars are dangerous b/c they are signed on some platforms and unsigned on others.
This commit is contained in:
parent
acdb6fb2a5
commit
ade57d0485
2 changed files with 10 additions and 9 deletions
|
@ -624,9 +624,9 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
|
||||||
if (*f == '%') {
|
if (*f == '%') {
|
||||||
const char* p = f;
|
const char* p = f;
|
||||||
width = 0;
|
width = 0;
|
||||||
while (isdigit(*f))
|
while (isdigit((unsigned)*f))
|
||||||
width = (width*10) + *f++ - '0';
|
width = (width*10) + *f++ - '0';
|
||||||
while (*++f && *f != '%' && !isalpha(*f))
|
while (*++f && *f != '%' && !isalpha((unsigned)*f))
|
||||||
;
|
;
|
||||||
|
|
||||||
/* skip the 'l' or 'z' in {%ld, %zd, %lu, %zu} since
|
/* skip the 'l' or 'z' in {%ld, %zd, %lu, %zu} since
|
||||||
|
@ -787,12 +787,12 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
|
||||||
zeropad = (*f == '0');
|
zeropad = (*f == '0');
|
||||||
/* parse the width.precision part */
|
/* parse the width.precision part */
|
||||||
width = 0;
|
width = 0;
|
||||||
while (isdigit(*f))
|
while (isdigit((unsigned)*f))
|
||||||
width = (width*10) + *f++ - '0';
|
width = (width*10) + *f++ - '0';
|
||||||
precision = 0;
|
precision = 0;
|
||||||
if (*f == '.') {
|
if (*f == '.') {
|
||||||
f++;
|
f++;
|
||||||
while (isdigit(*f))
|
while (isdigit((unsigned)*f))
|
||||||
precision = (precision*10) + *f++ - '0';
|
precision = (precision*10) + *f++ - '0';
|
||||||
}
|
}
|
||||||
/* handle the long flag, but only for %ld and %lu.
|
/* handle the long flag, but only for %ld and %lu.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* Cross platform case insenstive string compare functions
|
/* Cross platform case insensitive string compare functions
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "Python.h"
|
#include "Python.h"
|
||||||
|
@ -8,18 +8,19 @@ PyOS_mystrnicmp(const char *s1, const char *s2, Py_ssize_t size)
|
||||||
{
|
{
|
||||||
if (size == 0)
|
if (size == 0)
|
||||||
return 0;
|
return 0;
|
||||||
while ((--size > 0) && (tolower(*s1) == tolower(*s2))) {
|
while ((--size > 0) &&
|
||||||
|
(tolower((unsigned)*s1) == tolower((unsigned)*s2))) {
|
||||||
if (!*s1++ || !*s2++)
|
if (!*s1++ || !*s2++)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return tolower(*s1) - tolower(*s2);
|
return tolower((unsigned)*s1) - tolower((unsigned)*s2);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
PyOS_mystricmp(const char *s1, const char *s2)
|
PyOS_mystricmp(const char *s1, const char *s2)
|
||||||
{
|
{
|
||||||
while (*s1 && (tolower(*s1++) == tolower(*s2++))) {
|
while (*s1 && (tolower((unsigned)*s1++) == tolower((unsigned)*s2++))) {
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
return (tolower(*s1) - tolower(*s2));
|
return (tolower((unsigned)*s1) - tolower((unsigned)*s2));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue