[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 f58f4659535de2bc814f44cfe627a34420ed9207
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sat Dec 4 09:03:07 2004 +0100

    Gzip is working now.
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-31)

diff --git a/ChangeLog b/ChangeLog
index 815805a..7136989 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 02:03:07 GMT	John Goerzen <jgoerzen at complete.org>	patch-31
+
+    Summary:
+      Gzip is working now.
+    Revision:
+      missingh--head--0.7--patch-31
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/FileArchive/GZip.hs
+
+
 2004-12-04 02:01:12 GMT	John Goerzen <jgoerzen at complete.org>	patch-30
 
     Summary:
diff --git a/libsrc/MissingH/FileArchive/GZip.hs b/libsrc/MissingH/FileArchive/GZip.hs
index 93159a0..dd4970d 100644
--- a/libsrc/MissingH/FileArchive/GZip.hs
+++ b/libsrc/MissingH/FileArchive/GZip.hs
@@ -25,7 +25,7 @@ module MissingH.FileArchive.GZip (
 where
 
 import MissingH.Compression.Inflate
-import MissingH.Checksum.CRC32.POSIX
+import MissingH.Checksum.CRC32.GZip
 import Data.List
 import Data.Bits
 import Control.Monad.Error
@@ -100,17 +100,17 @@ read_section s =
     
 
 -- | Read the file's compressed data, returning
--- (Decompressed, CRC32, Remainder)
+-- (Decompressed, Calculated CRC32, Remainder)
 read_data :: String -> (String, Word32, String)
 read_data x = 
     let (decompressed1, remainder) = inflate_string_remainder x
-        (decompressed, crc32) = read_data_internal decompressed1 0 0
+        (decompressed, crc32) = read_data_internal decompressed1 0
         in
         (decompressed, crc32, remainder)
     where
-    read_data_internal [] ck l = ([], calc_crc32 [] ck l)
-    read_data_internal (x:xs) ck l =
-        let n = read_data_internal xs (iter_crc32 ck x) (l+1)
+    read_data_internal [] ck = ([], ck)
+    read_data_internal (x:xs) ck =
+        let n = read_data_internal xs (update_crc ck x)
             in
             (x : fst n, snd n)
     

-- 
haskell-testpack