diff options
| -rw-r--r-- | compat/strtol.c | 2 | ||||
| -rw-r--r-- | compat/strtoul.c | 2 | ||||
| -rw-r--r-- | generic/tclBinary.c | 14 | ||||
| -rw-r--r-- | generic/tclGetDate.y | 2 | ||||
| -rw-r--r-- | generic/tclInt.h | 4 | ||||
| -rw-r--r-- | generic/tclParse.c | 4 | ||||
| -rw-r--r-- | generic/tclParse.h | 2 |
7 files changed, 15 insertions, 15 deletions
diff --git a/compat/strtol.c b/compat/strtol.c index 811006a..b7f6919 100644 --- a/compat/strtol.c +++ b/compat/strtol.c @@ -53,7 +53,7 @@ strtol( */ p = string; - while (isspace(UCHAR(*p))) { + while (TclIsSpaceProc(*p)) { p += 1; } diff --git a/compat/strtoul.c b/compat/strtoul.c index 15587f1..e37eb05 100644 --- a/compat/strtoul.c +++ b/compat/strtoul.c @@ -74,7 +74,7 @@ strtoul( */ p = string; - while (isspace(UCHAR(*p))) { + while (TclIsSpaceProc(*p)) { p += 1; } if (*p == '-') { diff --git a/generic/tclBinary.c b/generic/tclBinary.c index 571eb07..2874ea8 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -2395,7 +2395,7 @@ BinaryDecodeHex( c = *data++; if (!isxdigit((int) c)) { - if (strict || !isspace(c)) { + if (strict || !TclIsSpaceProc(c)) { goto badChar; } i--; @@ -2742,7 +2742,7 @@ BinaryDecodeUu( if (lineLen < 0) { c = *data++; if (c < 32 || c > 96) { - if (strict || !isspace(c)) { + if (strict || !TclIsSpaceProc(c)) { goto badUu; } i--; @@ -2760,7 +2760,7 @@ BinaryDecodeUu( d[i] = c = *data++; if (c < 32 || c > 96) { if (strict) { - if (!isspace(c)) { + if (!TclIsSpaceProc(c)) { goto badUu; } else if (c == '\n') { goto shortUu; @@ -2804,7 +2804,7 @@ BinaryDecodeUu( } else if (c >= 32 && c <= 96) { data--; break; - } else if (strict || !isspace(c)) { + } else if (strict || !TclIsSpaceProc(c)) { goto badUu; } } while (data < dataend); @@ -2934,7 +2934,7 @@ BinaryDecode64( if (c == '=' && i > 1) { value <<= 6; cut++; - } else if (!strict && isspace(c)) { + } else if (!strict && TclIsSpaceProc(c)) { i--; } else { goto bad64; @@ -2954,7 +2954,7 @@ BinaryDecode64( ) { value <<= 6; if (i) cut++; - } else if (strict || !isspace(c)) { + } else if (strict || !TclIsSpaceProc(c)) { goto bad64; } else { i--; @@ -2975,7 +2975,7 @@ BinaryDecode64( goto bad64; } for (; data < dataend; data++) { - if (!isspace(*data)) { + if (!TclIsSpaceProc(*data)) { goto bad64; } } diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y index da4c3fd..ce7c2ce 100644 --- a/generic/tclGetDate.y +++ b/generic/tclGetDate.y @@ -897,7 +897,7 @@ TclDatelex( location->first_column = yyInput - info->dateStart; for ( ; ; ) { - while (isspace(UCHAR(*yyInput))) { + while (TclIsSpaceProc(*yyInput)) { yyInput++; } diff --git a/generic/tclInt.h b/generic/tclInt.h index 03cb5ae..0b67709 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -3025,8 +3025,8 @@ MODULE_SCOPE void TclInitNotifier(void); MODULE_SCOPE void TclInitObjSubsystem(void); MODULE_SCOPE void TclInitSubsystems(void); MODULE_SCOPE int TclInterpReady(Tcl_Interp *interp); -MODULE_SCOPE int TclIsSpaceProc(char byte); -MODULE_SCOPE int TclIsBareword(char byte); +MODULE_SCOPE int TclIsSpaceProc(int byte); +MODULE_SCOPE int TclIsBareword(int byte); MODULE_SCOPE Tcl_Obj * TclJoinPath(int elements, Tcl_Obj * const objv[], int forceRelative); MODULE_SCOPE int TclJoinThread(Tcl_ThreadId id, int *result); diff --git a/generic/tclParse.c b/generic/tclParse.c index f26f933..74b02ce 100644 --- a/generic/tclParse.c +++ b/generic/tclParse.c @@ -613,7 +613,7 @@ Tcl_ParseCommand( int TclIsSpaceProc( - char byte) + int byte) { return CHAR_TYPE(byte) & (TYPE_SPACE) || byte == '\n'; } @@ -642,7 +642,7 @@ TclIsSpaceProc( int TclIsBareword( - char byte) + int byte) { if (byte < '0' || byte > 'z') { return 0; diff --git a/generic/tclParse.h b/generic/tclParse.h index 20c609c..9247602 100644 --- a/generic/tclParse.h +++ b/generic/tclParse.h @@ -12,6 +12,6 @@ #define TYPE_CLOSE_BRACK 0x20 #define TYPE_BRACE 0x40 -#define CHAR_TYPE(c) (tclCharTypeTable+128)[(int)(c)] +#define CHAR_TYPE(c) (tclCharTypeTable+128)[(unsigned char)(c)] MODULE_SCOPE const char tclCharTypeTable[]; |