[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 58366d0a77666478eedfa10c29538c64b3e6ac95
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sun Dec 5 01:21:15 2004 +0100

    Strict CRC calculation
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-45)

diff --git a/ChangeLog b/ChangeLog
index 437470b..4d94bed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
 #
 
+2004-12-04 18:21:15 GMT	John Goerzen <jgoerzen at complete.org>	patch-45
+
+    Summary:
+      Strict CRC calculation
+    Revision:
+      missingh--head--0.7--patch-45
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/FileArchive/GZip.hs
+
+
 2004-12-04 17:45:08 GMT	John Goerzen <jgoerzen at complete.org>	patch-44
 
     Summary:
diff --git a/libsrc/MissingH/FileArchive/GZip.hs b/libsrc/MissingH/FileArchive/GZip.hs
index 99e51e5..aea921e 100644
--- a/libsrc/MissingH/FileArchive/GZip.hs
+++ b/libsrc/MissingH/FileArchive/GZip.hs
@@ -113,6 +113,7 @@ decompress s =
         procs ((_, content, foot):xs) = 
             let (nexth, nextb) = procs xs in
                 (content ++ nexth, (crc32valid foot) && nextb)
+--                (content ++ nexth, (&&) nextb $! (crc32valid foot))
         in
         do x <- read_sections s
            return $ procs x
@@ -161,7 +162,8 @@ read_data x =
     where
     read_data_internal [] ck = ([], ck)
     read_data_internal (x:xs) ck =
-        let n = read_data_internal xs (update_crc ck x)
+        let newcrc = update_crc ck x
+            n = newcrc `seq` read_data_internal xs newcrc
             in
             (x : fst n, snd n)
     

-- 
haskell-testpack