diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-09-27 10:23:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-09-27 10:23:57 (GMT) |
| commit | 5f54c3fb44efbfa40563a0640295e7350b5ca679 (patch) | |
| tree | 23d2ad46aa7c8cad3a4051d0c88af6534cdeef57 /generic | |
| parent | f3cb255841150f6270c05cab8324748ed71ec527 (diff) | |
| parent | 524d6bb36ec16228d711b48a3806f39100e388d2 (diff) | |
| download | tcl-5f54c3fb44efbfa40563a0640295e7350b5ca679.zip tcl-5f54c3fb44efbfa40563a0640295e7350b5ca679.tar.gz tcl-5f54c3fb44efbfa40563a0640295e7350b5ca679.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclTrace.c | 8 | ||||
| -rw-r--r-- | generic/tclZipfs.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/generic/tclTrace.c b/generic/tclTrace.c index a718c86..797714d 100644 --- a/generic/tclTrace.c +++ b/generic/tclTrace.c @@ -2005,10 +2005,10 @@ TraceVarProc( int rewind = ((Interp *)interp)->execEnvPtr->rewind; /* - * We might call Tcl_EvalEx() below, and that might evaluate [trace vdelete] - * which might try to free tvarPtr. We want to use tvarPtr until the end - * of this function, so we use Tcl_Preserve() and Tcl_Release() to be sure - * it is not freed while we still need it. + * We might call Tcl_EvalEx() below, and that might evaluate + * [trace remove variable] which might try to free tvarPtr. We want to + * use tvarPtr until the end of this function, so we use Tcl_Preserve() + * and Tcl_Release() to be sure it is not freed while we still need it. */ result = NULL; diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index 69c1421..0e14784 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -1118,7 +1118,7 @@ ContainsMountPoint (const char *path, int pathLen) ZipFile *zf = (ZipFile *) Tcl_GetHashValue(hPtr); if (zf->mountPointLen == 0) { - /* + /* * Enumerate the contents of the ZIP; it's mounted on the root. * TODO - a holdover from androwish? Tcl does not allow mounting * outside of the //zipfs:/ area. @@ -5528,7 +5528,7 @@ ZipFSPathInFilesystemProc( } path = TclGetStringFromObj(pathPtr, &len); /* - * TODO - why not make ZIPFS_VOLUME both necessary AND sufficient? + * TODO - why not make ZIPFS_VOLUME both necessary AND sufficient? * Currently we only claim ownership if there is a matching mount. */ if (strncmp(path, ZIPFS_VOLUME, ZIPFS_VOLUME_LEN) != 0) { @@ -5560,7 +5560,7 @@ ZipFSPathInFilesystemProc( ZipFile *zf = (ZipFile *) Tcl_GetHashValue(hPtr); if (zf->mountPointLen == 0) { - /* + /* * Mounted on the root (/) * TODO - a holdover from androwish? Tcl does not allow mounting * outside of the //zipfs:/ area. |