diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-01-27 07:59:18 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-01-27 07:59:18 (GMT) |
| commit | d4d2e27e9db94033064ac03350e27f2b0c17301e (patch) | |
| tree | a85155300c66199bf64e7627a4a55810b33b73e9 /generic/tkConfig.c | |
| parent | 186f5c8cca88c9e09ac1273f16161b40da91d5dc (diff) | |
| parent | 3d68ec991c54fcf2472aaf3b09fae7b6aa224254 (diff) | |
| download | tk-d4d2e27e9db94033064ac03350e27f2b0c17301e.zip tk-d4d2e27e9db94033064ac03350e27f2b0c17301e.tar.gz tk-d4d2e27e9db94033064ac03350e27f2b0c17301e.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tkConfig.c')
| -rw-r--r-- | generic/tkConfig.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/generic/tkConfig.c b/generic/tkConfig.c index 34dc12e..a187c51 100644 --- a/generic/tkConfig.c +++ b/generic/tkConfig.c @@ -637,10 +637,14 @@ DoObjConfig( valuePtr = NULL; newInt = 0; } else if (Tcl_GetIntFromObj(nullOK ? NULL : interp, valuePtr, &newInt) != TCL_OK) { - if (nullOK && interp) { - Tcl_AppendResult(interp, "expected integer or \"\" but got \"", - Tcl_GetString(valuePtr), "\"", NULL); - } + if (nullOK && interp) { + Tcl_Obj *msg = Tcl_NewStringObj("expected integer or \"\" but got \"", -1); + + Tcl_AppendLimitedToObj(msg, Tcl_GetString(valuePtr), -1, 50, ""); + Tcl_AppendToObj(msg, "\"", -1); + Tcl_SetObjResult(interp, msg); + Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", NULL); + } return TCL_ERROR; } if (internalPtr != NULL) { @@ -678,10 +682,14 @@ DoObjConfig( newDbl = 0; } else { if (Tcl_GetDoubleFromObj(nullOK ? NULL : interp, valuePtr, &newDbl) != TCL_OK) { - if (nullOK && interp) { - Tcl_AppendResult(interp, "expected floating-point number or \"\" but got \"", - Tcl_GetString(valuePtr), "\"", NULL); - } + if (nullOK && interp) { + Tcl_Obj *msg = Tcl_NewStringObj("expected floating-point number or \"\" but got \"", -1); + + Tcl_AppendLimitedToObj(msg, Tcl_GetString(valuePtr), -1, 50, ""); + Tcl_AppendToObj(msg, "\"", -1); + Tcl_SetObjResult(interp, msg); + Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", NULL); + } return TCL_ERROR; } } |