Fix the vfs::crc function and test to conform to its actual use in the zipvfs code.

diff --git a/library/vfsUtils.tcl b/library/vfsUtils.tcl
index a146c2b392a1848a9b0f8cb37e7685bddd8ecfc5..f853725239ec0a87475be8cac94223f5cbd78ee3 100644 (file)
--- a/library/vfsUtils.tcl
+++ b/library/vfsUtils.tcl
@@ -13,18 +13,21 @@ namespace eval ::vfs {
 }
 
 # This can be overridden to use a different memchan implementation
+# With Tcl 8.6 will be overridden using [chan create] via vfslib.tcl
 proc ::vfs::memchan {args} {
     ::package require Memchan
     uplevel 1 [list ::memchan] $args
 }
 
 # This can be overridden to use a different crc implementation
+# With Tcl 8.6 will be overridden using [zlib crc32] via vfslib.tcl
 proc ::vfs::crc {args} {
-    ::package require Trf
-    uplevel 1 [linsert [linsert $args end-1 "--"] 0 ::crc]
+    ::package require crc32 ;# tcllib
+    uplevel 1 [linsert [linsert $args end-1 "--"] 0 ::crc::crc32]
 }
 
 # This can be overridden to use a different zip implementation
+# With Tcl 8.6 will be overridden using core zlib via vfslib.tcl
 proc ::vfs::zip {args} {
     ::package require Trf
     uplevel 1 [linsert [linsert $args end-1 "--"] 0 ::zip]

diff --git a/tests/vfs.test b/tests/vfs.test
index fbc91d63eaae7af8dba2b6e66bc0df5e83ab2705..7cbc1aa2c0edd0a266a386ad4d3bf23edccdfde8 100644 (file)
--- a/tests/vfs.test
+++ b/tests/vfs.test
@@ -129,8 +129,8 @@ test vfs-3.2 {vfs helpers: crc} {
     # What this means is that tclvfs can't find some other
     # extension/code it requires -- you may need to install
     # the Trf extension for example.
-    ::vfs::crc abcd
-} {Kc*}
+    format %08x [::vfs::crc abcd]
+} {ed82cd11}
 
 test vfs-3.3 {vfs helpers: zip} {
     # If this test fails, probably many other tests will fail too (at