diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-11-22 08:03:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-11-22 08:03:24 (GMT) |
| commit | 0e7af6107e1f3b060581d8eb6bacb968c314314d (patch) | |
| tree | 876767675902b62a6c94f7501412aa763eeea69a /generic/tclTrace.c | |
| parent | f49b4015121c06d999d6a370fe355c626eec0deb (diff) | |
| parent | e537ff7be6133bfccde0c8e2de74610d17c0e94f (diff) | |
| download | tcl-0e7af6107e1f3b060581d8eb6bacb968c314314d.zip tcl-0e7af6107e1f3b060581d8eb6bacb968c314314d.tar.gz tcl-0e7af6107e1f3b060581d8eb6bacb968c314314d.tar.bz2 | |
Merge 8.6
In addition, tclWinSerial.c: Change back two internal variables from size_t -> int, shouldn't have been done here.
Diffstat (limited to 'generic/tclTrace.c')
| -rw-r--r-- | generic/tclTrace.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/generic/tclTrace.c b/generic/tclTrace.c index 8663eae..db48f7a 100644 --- a/generic/tclTrace.c +++ b/generic/tclTrace.c @@ -537,9 +537,7 @@ TraceExecutionObjCmd( Tcl_DeleteTrace(interp, tcmdPtr->stepTrace); tcmdPtr->stepTrace = NULL; - if (tcmdPtr->startCmd != NULL) { - ckfree(tcmdPtr->startCmd); - } + ckfree(tcmdPtr->startCmd); } if (tcmdPtr->flags & TCL_TRACE_EXEC_IN_PROGRESS) { /* @@ -1349,9 +1347,7 @@ TraceCommandProc( if (tcmdPtr->stepTrace != NULL) { Tcl_DeleteTrace(interp, tcmdPtr->stepTrace); tcmdPtr->stepTrace = NULL; - if (tcmdPtr->startCmd != NULL) { - ckfree(tcmdPtr->startCmd); - } + ckfree(tcmdPtr->startCmd); } if (tcmdPtr->flags & TCL_TRACE_EXEC_IN_PROGRESS) { /* @@ -1814,9 +1810,7 @@ TraceExecutionProc( && (strcmp(command, tcmdPtr->startCmd) == 0)) { Tcl_DeleteTrace(interp, tcmdPtr->stepTrace); tcmdPtr->stepTrace = NULL; - if (tcmdPtr->startCmd != NULL) { - ckfree(tcmdPtr->startCmd); - } + ckfree(tcmdPtr->startCmd); } /* @@ -1941,9 +1935,7 @@ TraceExecutionProc( if (tcmdPtr->stepTrace != NULL) { Tcl_DeleteTrace(interp, tcmdPtr->stepTrace); tcmdPtr->stepTrace = NULL; - if (tcmdPtr->startCmd != NULL) { - ckfree(tcmdPtr->startCmd); - } + ckfree(tcmdPtr->startCmd); } } if (call) { |