diff options
| -rw-r--r-- | generic/tclTrace.c | 8 | ||||
| -rw-r--r-- | generic/tclZipfs.c | 6 | ||||
| -rw-r--r-- | tests/link.test | 4 | ||||
| -rw-r--r-- | tests/proc-old.test | 2 | ||||
| -rw-r--r-- | tests/trace.test | 8 |
5 files changed, 14 insertions, 14 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. diff --git a/tests/link.test b/tests/link.test index 6ac2277..d515e42 100644 --- a/tests/link.test +++ b/tests/link.test @@ -386,7 +386,7 @@ test link-8.1 {Tcl_UpdateLinkedVar procedure} {testlink} { testlink set 14 -2.0 0 xyzzy 995511 64 250 30000 60000 0xbeefbabe 12321 32123 3.25 1231231234 trace add var int write x testlink update 32 4.0 3 abcd 113355 65 251 30001 60001 0xbabebeef 12322 32124 3.125 12312312340 - trace remove var int write x + trace remove variable int write x return $x } {{int {} write} 32 -2.0 0 xyzzy 995511} test link-8.2 {Tcl_UpdateLinkedVar procedure} {testlink} { @@ -400,7 +400,7 @@ test link-8.2 {Tcl_UpdateLinkedVar procedure} {testlink} { testlink delete trace add var int write x testlink update 32 4.0 6 abcd 113355 65 251 30001 60001 0xbabebeef 12322 32124 3.125 12312312340 - trace remove var int write x + trace remove variable int write x return $x } {} test link-8.3 {Tcl_UpdateLinkedVar procedure, read-only variable} {testlink} { diff --git a/tests/proc-old.test b/tests/proc-old.test index 2f0f417..8c510ce 100644 --- a/tests/proc-old.test +++ b/tests/proc-old.test @@ -146,7 +146,7 @@ test proc-old-3.8 {local and global arrays} { catch {unset a} trace add var a(1) write t1 set info {} - do {global a; trace remove var a(1) write t1} + do {global a; trace remove variable a(1) write t1} set a(1) 44 set info } {} diff --git a/tests/trace.test b/tests/trace.test index c95379d..2b16e2f 100644 --- a/tests/trace.test +++ b/tests/trace.test @@ -1236,23 +1236,23 @@ test trace-18.1 {unset traces on procedure returns} { p1 foo bar set info } {0 {a x y}} -test trace-18.2 {namespace delete / trace vdelete combo} { +test trace-18.2 {namespace delete / trace remove variable combo} { namespace eval ::foo { variable x 123 } proc p1 args { - trace vdelete ::foo::x u p1 + trace remove variable ::foo::x unset p1 } trace add variable ::foo::x unset p1 namespace delete ::foo info exists ::foo::x } 0 -test trace-18.3 {namespace delete / trace vdelete combo, Bug \#1337229} { +test trace-18.3 {namespace delete / trace remove variable combo, Bug \#1337229} { namespace eval ::ns {} trace add variable ::ns::var unset {unset ::ns::var ;#} namespace delete ::ns } {} -test trace-18.4 {namespace delete / trace vdelete combo, Bug \#1338280} { +test trace-18.4 {namespace delete / trace remove variable combo, Bug \#1338280} { namespace eval ::ref {} set ::ref::var1 AAA trace add variable ::ref::var1 unset doTrace |