Changeset 3588 for lang/perl/Archive-Lha/trunk/Lha.xs

Timestamp:

12/26/07 12:00:47 (13 months ago)

Author:

charsbar

Message:

lang/perl/Archive-Lha: lots of changes, cleanups, pods and 0.02 -> CPAN

Files:

• lang/perl/Archive-Lha/trunk/Lha.xs (modified) (18 diffs)

lang/perl/Archive-Lha/trunk/Lha.xs

@@ -10 +10 @@
 #include "ppport.h"
 #include "Lha.h"
+
+/*
+  these are not from LHa for UNIX
+*/
+
+void
+destroy_stash(LhaStash * stash)
+{
+  Safefree(stash->tree->left);
+  Safefree(stash->tree->right);
+  Safefree(stash->tree);
+  Safefree(stash->pt->table);
+  Safefree(stash->pt->length);
+  Safefree(stash->pt);
+  Safefree(stash->c->table);
+  Safefree(stash->c->length);
+  Safefree(stash->c);
+  Safefree(stash->bit);
+  Safefree(stash->queue);
+  Safefree(stash);
+}
+
+void
+safe_croak(LhaStash * stash, unsigned char * dying_message)
+{
+  destroy_stash(stash);
+  croak(dying_message);
+}
 
 void
@@ -40 +68 @@
   SPAGAIN;
   if (n != 1)
-    croak("There's something wrong in 'read' callback");
+    safe_croak(stash, "There's something wrong in 'read' callback");
   Copy(POPp, stash->bit->readbuf, len, unsigned char);
   PUTBACK;
@@ -46 +74 @@
   LEAVE;
 }
+
+/*
+  modified from LHa for UNIX: bitio.c ver 1.14
+    original authors:
+      Source All chagned       1995.01.14  N.Watazaki
+      Separated from crcio.c   2002.10.26  Koji Arai
+*/
 
 unsigned short
@@ -62 +97 @@
     n -= bit->pos;
     bit->value = shiftbits(bit, bit->pos);
-    if (stash->packed_size > 0) {
+    if (stash->encoded_size > 0) {
       if (bit->readpos == 0) {
-        if (stash->packed_size > READBUF_SIZE)
+        if (stash->encoded_size > READBUF_SIZE)
           len = READBUF_SIZE;
         else
-          len = stash->packed_size;
+          len = stash->encoded_size;
         input(stash, len);
       }
@@ -73 +108 @@
       if (bit->readpos == READBUF_SIZE)
         bit->readpos = 0;
-      stash->packed_size--;
+      stash->encoded_size--;
     }
     else
@@ -97 +132 @@
   return bits;
 }
+
+void
+init_bitstream(LhaStash * stash)
+{
+  LhaBitstream  * bitstream;
+
+  Newxz(bitstream, sizeof(LhaBitstream), LhaBitstream);
+  stash->bit = bitstream;
+
+  stash->bit->blocksize = 0;
+  stash->bit->readpos = 0;
+  stash->bit->value = 0;
+  stash->bit->buf = 0;
+  stash->bit->pos = 0;
+  fillbuf(stash, USHORT_BIT);
+}
+
+/*
+  modified from LHa for UNIX: maketbl.c ver 1.14
+    original author(s):
+      Source All chagned       1995.01.14  N.Watazaki
+*/
 
 void
@@ -112 +169 @@
 
   if (table->bit > USHORT_BIT) {
-    croak("Table is broken: table bit is too large");
+    safe_croak(stash, "Table is broken: table bit is too large");
   }
 
@@ -122 +179 @@
   for(i = 0; i < nchar; i++)
     if (table->length[i] > USHORT_BIT) {
-      croak("Table is broken: bit length is too large");
+      safe_croak(stash, "Table is broken: bit length is too large");
     }
     else
@@ -133 +190 @@
   }
   if (total & USHORT_MAX) {
-    croak("Table is broken: total mismatch");
+    safe_croak(stash, "Table is broken: total mismatch");
   }
 
@@ -162 +219 @@
       j = start[bit];
       if ((j >> bits_to_shift) > table->size) {
-        croak("Table is broken");
+        safe_croak(stash, "Table is broken");
       }
       p = &(table->table[j >> bits_to_shift]);
@@ -183 +240 @@
   }
 }
+
+/*
+  modified from LHa for UNIX: huf.c ver 1.14
+    original authors:
+      Source All chagned       1995.01.14  N.Watazaki
+      Support LH7 & Bug Fixed  2000.10. 6  t.okamoto
+*/
 
 void
@@ -328 +392 @@
 }
 
+/*
+  modified from LHa for UNIX: crcio.c ver 1.14
+    original author(s):
+      Source All chagned       1995.01.14  N.Watazaki
+*/
+
 unsigned short
 calc_crc16(unsigned short crc, unsigned char * str, unsigned int len)
@@ -335 +405 @@
   return crc;
 }
+
+/*
+  this is not from LHa for UNIX
+*/
 
 void
@@ -377 +451 @@
 }
 
-void
-free_tables(LhaStash * stash)
-{
-  Safefree(stash->tree->left);
-  Safefree(stash->tree->right);
-  Safefree(stash->tree);
-  Safefree(stash->pt->table);
-  Safefree(stash->pt->length);
-  Safefree(stash->pt);
-  Safefree(stash->c->table);
-  Safefree(stash->c->length);
-  Safefree(stash->c);
-}
-
-void
-init_bitstream(LhaStash * stash)
-{
-  LhaBitstream  * bitstream;
-
-  Newxz(bitstream, sizeof(LhaBitstream), LhaBitstream);
-  stash->bit = bitstream;
-
-  stash->bit->blocksize = 0;
-  stash->bit->readpos = 0;
-  stash->bit->value = 0;
-  stash->bit->buf = 0;
-  stash->bit->pos = 0;
-  fillbuf(stash, USHORT_BIT);
-}
-
-void
-free_bitstream(LhaStash * stash)
-{
-  Safefree(stash->bit);
-}
-
-MODULE = Archive::Lha PACKAGE = Archive::Lha PREFIX = xs_
+MODULE = Archive::Lha PACKAGE = Archive::Lha::Decode::Base PREFIX = xs_
 
 PROTOTYPES: DISABLE
+
+#/*
+#  modified from LHa for UNIX: slide.c ver 1.14
+#    original authors:
+#      Modified                                   Nobutaka Watazaki
+#  Ver. 1.14d  Exchanging a search algorithm  1997.01.11  T.Okamoto
+#*/
 
 unsigned short
@@ -442 +487 @@
     Newxz(stash, sizeof(LhaStash), LhaStash);
 
+    stash->queue = queue;
+
     stash->read          = self_sv("read");
     stash->write         = self_sv("write");
-    stash->original_size = self_uint("original");
-    stash->packed_size   = self_uint("packed");
+    stash->original_size = self_uint("original_size");
+    stash->encoded_size  = self_uint("encoded_size");
 
     init_tables(self, stash);
@@ -485 +532 @@
     }
 
-    free_tables(stash);
-    free_bitstream(stash);
-    Safefree(stash);
-    Safefree(queue);
+    destroy_stash(stash);
 
     RETVAL = crc16;
@@ -495 +539 @@
     RETVAL
 
-unsigned short
-xs_crc16(unsigned short crc, SV * str, unsigned int len)
+MODULE = Archive::Lha PACKAGE = Archive::Lha::CRC PREFIX = xs_
+
+PROTOTYPES: DISABLE
+
+#/* this is not from LHa for UNIX */
+
+unsigned short
+xs_update(unsigned short crc, SV * str, unsigned int len)
   CODE:
     RETVAL = calc_crc16(crc, SvPV(str, len), len);
@@ -502 +552 @@
   OUTPUT:
     RETVAL
+
+MODULE = Archive::Lha PACKAGE = Archive::Lha PREFIX = xs_
+
+PROTOTYPES: DISABLE