diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2005-12-19 06:05:18 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2005-12-19 06:05:18 (GMT) |
| commit | 30b5c5d0116f8e670a6ca74dcb6bd076a919d681 (patch) | |
| tree | 20c3e7e3ec210387941f3e9ac930537f71410a09 /Modules | |
| parent | 5d0ad50f5acf84f2e8a1ca5c6951f333aef0e25a (diff) | |
| download | cpython-30b5c5d0116f8e670a6ca74dcb6bd076a919d681.zip cpython-30b5c5d0116f8e670a6ca74dcb6bd076a919d681.tar.gz cpython-30b5c5d0116f8e670a6ca74dcb6bd076a919d681.tar.bz2 | |
Fix SF bug #1072182, problems with signed characters.
Most of these can be backported.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_hotshot.c | 2 | ||||
| -rw-r--r-- | Modules/_tkinter.c | 2 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 2 | ||||
| -rw-r--r-- | Modules/pyexpat.c | 2 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 3 | ||||
| -rw-r--r-- | Modules/stropmodule.c | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/Modules/_hotshot.c b/Modules/_hotshot.c index 5e4a9f7..758c4ee 100644 --- a/Modules/_hotshot.c +++ b/Modules/_hotshot.c @@ -1396,7 +1396,7 @@ get_version_string(void) char *buffer; int i = 0; - while (*rev && !isdigit((int)*rev)) + while (*rev && !isdigit(Py_CHARMASK(*rev))) ++rev; while (rev[i] != ' ' && rev[i] != '\0') ++i; diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index dd1620a..b898249 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -636,7 +636,7 @@ Tkapp_New(char *screenName, char *baseName, char *className, } strcpy(argv0, className); - if (isupper((int)(argv0[0]))) + if (isupper(Py_CHARMASK((argv0[0])))) argv0[0] = tolower(argv0[0]); Tcl_SetVar(v->interp, "argv0", argv0, TCL_GLOBAL_ONLY); ckfree(argv0); diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index a08058f..b783573 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -463,7 +463,7 @@ os2_formatmsg(char *msgbuf, int msglen, char *reason) if (strlen(msgbuf) > 0) { /* If Non-Empty Msg, Trim CRLF */ char *lastc = &msgbuf[ strlen(msgbuf)-1 ]; - while (lastc > msgbuf && isspace(*lastc)) + while (lastc > msgbuf && isspace(Py_CHARMASK(*lastc))) *lastc-- = '\0'; /* Trim Trailing Whitespace (CRLF) */ } diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c index ca2a850..c827581 100644 --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -1803,7 +1803,7 @@ get_version_string(void) char *rev = rcsid; int i = 0; - while (!isdigit((int)*rev)) + while (!isdigit(Py_CHARMASK(*rev))) ++rev; while (rev[i] != ' ' && rev[i] != '\0') ++i; diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 3391405..038bd1f 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -506,7 +506,8 @@ set_error(void) if (strlen(outbuf) > 0) { /* If non-empty msg, trim CRLF */ char *lastc = &outbuf[ strlen(outbuf)-1 ]; - while (lastc > outbuf && isspace(*lastc)) { + while (lastc > outbuf && + isspace(Py_CHARMASK(*lastc))) { /* Trim trailing whitespace (CRLF) */ *lastc-- = '\0'; } diff --git a/Modules/stropmodule.c b/Modules/stropmodule.c index ce19a05..ed72a71 100644 --- a/Modules/stropmodule.c +++ b/Modules/stropmodule.c @@ -757,7 +757,7 @@ strop_atoi(PyObject *self, PyObject *args) x = (long) PyOS_strtoul(s, &end, base); else x = PyOS_strtol(s, &end, base); - if (end == s || !isalnum((int)end[-1])) + if (end == s || !isalnum(Py_CHARMASK(end[-1]))) goto bad; while (*end && isspace(Py_CHARMASK(*end))) end++; |