From: Neal Norwitz Date: Mon, 10 Apr 2006 02:17:47 +0000 (+0000) Subject: Get rid of warnings about using chars as subscripts X-Git-Tag: v2.5a2~378 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65c05b20e97a493b917fa71f10535512c713c662;p=python Get rid of warnings about using chars as subscripts on Alpha (and possibly other platforms) by using Py_CHARMASK(). --- diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index b85e15844c..ebaf799b14 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -647,7 +647,7 @@ Tkapp_New(char *screenName, char *baseName, char *className, strcpy(argv0, className); if (isupper(Py_CHARMASK(argv0[0]))) - argv0[0] = tolower(argv0[0]); + argv0[0] = tolower(Py_CHARMASK(argv0[0])); Tcl_SetVar(v->interp, "argv0", argv0, TCL_GLOBAL_ONLY); ckfree(argv0); diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c index 9eda6537b6..faadf88367 100644 --- a/Modules/unicodedata.c +++ b/Modules/unicodedata.c @@ -759,7 +759,7 @@ _gethash(const char *s, int len, int scale) unsigned long h = 0; unsigned long ix; for (i = 0; i < len; i++) { - h = (h * scale) + (unsigned char) toupper(s[i]); + h = (h * scale) + (unsigned char) toupper(Py_CHARMASK(s[i])); ix = h & 0xff000000; if (ix) h = (h ^ ((ix>>24) & 0xff)) & 0x00ffffff; @@ -906,7 +906,7 @@ _cmpname(PyObject *self, int code, const char* name, int namelen) if (!_getucname(self, code, buffer, sizeof(buffer))) return 0; for (i = 0; i < namelen; i++) { - if (toupper(name[i]) != buffer[i]) + if (toupper(Py_CHARMASK(name[i])) != buffer[i]) return 0; } return buffer[namelen] == '\0';