diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-04-20 14:08:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-04-20 14:08:24 (GMT) |
| commit | 3073ed65fb2a07e9b0dad37438ee5a7c52a5ca90 (patch) | |
| tree | 3a5aeb2357082c035ce057e6846342ffa96579bc /generic/tclObj.c | |
| parent | f235d36b4357a1d11f76fec190e70fd2da125ae0 (diff) | |
| parent | 46e63b3be5cb5ce16dd97cc9f4c17481a5c2f0c8 (diff) | |
| download | tcl-3073ed65fb2a07e9b0dad37438ee5a7c52a5ca90.zip tcl-3073ed65fb2a07e9b0dad37438ee5a7c52a5ca90.tar.gz tcl-3073ed65fb2a07e9b0dad37438ee5a7c52a5ca90.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclObj.c')
| -rw-r--r-- | generic/tclObj.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclObj.c b/generic/tclObj.c index 89b576c..40fc73b 100644 --- a/generic/tclObj.c +++ b/generic/tclObj.c @@ -2208,14 +2208,14 @@ Tcl_GetBoolFromObj( if (boolPtr != NULL) { flags &= (TCL_NULL_OK - 1); if (flags & (int)~sizeof(int8_t)) { - if (flags == sizeof(int64_t)) { - *(int64_t *)boolPtr = result; + if (flags == sizeof(int16_t)) { + *(int16_t *)boolPtr = result; return TCL_OK; } else if (flags == sizeof(int32_t)) { *(int32_t *)boolPtr = result; return TCL_OK; - } else if (flags == sizeof(int16_t)) { - *(int16_t *)boolPtr = result; + } else if (flags == sizeof(int64_t)) { + *(int64_t *)boolPtr = result; return TCL_OK; } } @@ -2233,9 +2233,9 @@ int Tcl_GetBooleanFromObj( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ Tcl_Obj *objPtr, /* The object from which to get boolean. */ - int *boolPtr) /* Place to store resulting boolean. */ + int *intPtr) /* Place to store resulting boolean. */ { - return Tcl_GetBoolFromObj(interp, objPtr, sizeof(int), boolPtr); + return Tcl_GetBoolFromObj(interp, objPtr, sizeof(int), intPtr); } /* |