summaryrefslogtreecommitdiffstats
path: root/generic/tkEntry.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-01-28 11:07:35 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-01-28 11:07:35 (GMT)
commit9801d3f9faf234f0e6f8a9045dc1a8376696258b (patch)
tree6ad2cd763f02fefa9a93ec0ba7eb7df1fd0d5394 /generic/tkEntry.c
parent25fc9b01d247c1a32fc662dfb85bafe051ae167b (diff)
parented0a2a5b2bdcb0bacd90a00c5f95bc1c2d7b8b45 (diff)
downloadtk-9801d3f9faf234f0e6f8a9045dc1a8376696258b.zip
tk-9801d3f9faf234f0e6f8a9045dc1a8376696258b.tar.gz
tk-9801d3f9faf234f0e6f8a9045dc1a8376696258b.tar.bz2
Merge trunk
Diffstat (limited to 'generic/tkEntry.c')
-rw-r--r--generic/tkEntry.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index b36a163..23eb31d 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -3317,7 +3317,7 @@ EntryValidate(
* string). */
{
Tcl_Interp *interp = entryPtr->interp;
- int code, result;
+ int code, isOK;
code = Tcl_EvalEx(interp, cmd, -1, TCL_EVAL_GLOBAL | TCL_EVAL_DIRECT);
@@ -3339,7 +3339,7 @@ EntryValidate(
*/
if (Tcl_GetBooleanFromObj(interp, Tcl_GetObjResult(interp),
- &result) != TCL_OK) {
+ &isOK) != TCL_OK) {
Tcl_AddErrorInfo(interp,
"\n (invalid boolean result from validation command)");
Tcl_BackgroundException(interp, TCL_ERROR);
@@ -3348,7 +3348,7 @@ EntryValidate(
}
Tcl_ResetResult(interp);
- return (result ? TCL_OK : TCL_BREAK);
+ return (isOK ? TCL_OK : TCL_BREAK);
}
/*