* src/slide.c: refined.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/lha/lha/trunk@617 6a8cc165-1e22-0410-a132-eb4e3f353aba

diff --git a/src/slide.c b/src/slide.c
index 71b4751..06282d1 100644 (file)
--- a/src/slide.c
+++ b/src/slide.c
@@ -12,7 +12,6 @@
 #endif
 
 #include "lha.h"
-#include <assert.h>
 
 #ifdef DEBUG
 FILE *fout = NULL;
@@ -121,7 +120,8 @@ encode_alloc(method)
         dicbit = LZHUFF7_DICBIT;    /* 16 bits */
         break;
     default:
-        assert(0);
+        error("unknown method %d", method);
+        exit(1);
     }
 
     dicsiz = (((unsigned long)1) << dicbit);
@@ -150,27 +150,20 @@ static void init_slide()
         hash[i] = NIL;
         too_flag[i] = 0;
     }
-    /*
-    for (i = 0; i < DICSIZ; i++) {
-        prev[i] = NIL;
-    }
-    */
 }
 
 /* ¼­½ñ¤ò DICSIZ ʬ Á°¤Ë¤º¤é¤¹ */
 
-static unsigned int
+static void
 update(crc)
-    unsigned int crc;
+    unsigned int *crc;
 {
     unsigned int i, j;
     long n;
 
-    assert(dicsiz > 0);
-    assert(txtsiz - dicsiz > 0);
     memmove(&text[0], &text[dicsiz], txtsiz - dicsiz);
 
-    n = fread_crc(&crc, &text[txtsiz - dicsiz], dicsiz, infile);
+    n = fread_crc(crc, &text[txtsiz - dicsiz], dicsiz, infile);
 
     remainder += n;
     encoded_origsize += n;      /* total size of read bytes */
@@ -185,8 +178,6 @@ update(crc)
         j = prev[i];
         prev[i] = (j > dicsiz) ? j - dicsiz : NIL;
     }
-
-    return crc;
 }
 
 
@@ -263,20 +254,18 @@ static void match_insert()
 
 /* ¥Ý¥¤¥ó¥¿¤ò¿Ê¤á¡¢¼­½ñ¤ò¹¹¿·¤·¡¢¥Ï¥Ã¥·¥åÃͤò¹¹¿·¤¹¤ë */
 
-static unsigned int
+static void
 get_next(crc)
-    unsigned int crc;
+    unsigned int *crc;
 {
     remainder--;
     if (++pos >= txtsiz - maxmatch) {
-        crc = update(crc);
+        update(crc);
 #ifdef DEBUG
         noslide = 0;
 #endif
     }
     hval = ((hval << 5) ^ text[pos + 2]) & (unsigned)(HSHSIZ - 1);
-
-    return crc;
 }
 
 unsigned int
@@ -323,7 +312,7 @@ encode(interface)
     while (remainder > 0 && ! unpackable) {
         lastmatchlen = matchlen;  lastmatchoffset = pos - matchpos - 1;
         --matchlen;
-        crc = get_next(crc);  match_insert();
+        get_next(&crc);  match_insert();
         if (matchlen > remainder) matchlen = remainder;
         if (matchlen > lastmatchlen || lastmatchlen < THRESHOLD) {
             encode_set.output(text[pos - 1], 0);
@@ -352,10 +341,10 @@ encode(interface)
             }
 #endif
             while (--lastmatchlen > 0) {
-                crc = get_next(crc);  insert();
+                get_next(&crc);  insert();
                 count++;
             }
-            crc = get_next(crc);
+            get_next(&crc);
             matchlen = THRESHOLD - 1;
             match_insert();
             if (matchlen > remainder) matchlen = remainder;