Changeset 12893 for lang/perl/Archive-Lha

Timestamp:

05/31/08 11:46:39 (6 months ago)

Author:

charsbar

Message:

Archive-Lha: try to silence some of the known warnings (though with quite an ugly way)

Location:

lang/perl/Archive-Lha/trunk

Files:

• Lha.h (modified) (2 diffs)
• Lha.xs (modified) (22 diffs)

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

@@ -33 +33 @@
   hash_store(self, key, newSVpv(n, 0))
 
-#define create_mask(n) \
-  (1 << (USHORT_BIT - 1 - n))
+#define char_bit       8
+#define uchar_bit      8
+#define ushort_bit    16
 
-#define CHAR_BIT       8
-#define UCHAR_BIT      8
-#define USHORT_BIT    16
+#define uchar_max (1 << uchar_bit) - 1
+#define ushort_max (1 << ushort_bit) - 1
 
-#ifndef USHORT_MAX
-#define USHORT_MAX (1 << USHORT_BIT) - 1
+#define uchar_center  (1 << (uchar_bit - 1))
+#define ushort_center (1 << (ushort_bit - 1))
+
+#ifndef min
+#define min(a,b) ((a) <= (b) ? (a) : (b))
 #endif
 
-#define UCHAR_CENTER  (1 << (UCHAR_BIT - 1))
-#define USHORT_CENTER (1 << (USHORT_BIT - 1))
-#define MIN(a,b) ((a) <= (b) ? (a) : (b))
+#define create_mask(n) \
+  (1 << (ushort_bit - 1 - n))
 
-#define READBUF_SIZE 4096
+#define readbuf_size 4096
 
 typedef struct LhaTree {
@@ -68 +70 @@
   unsigned char  pos;
   unsigned short blocksize;
-  unsigned char  readbuf[READBUF_SIZE];
+  unsigned char  readbuf[readbuf_size];
   unsigned short readpos;
 } LhaBitstream;

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

@@ -33 +33 @@
 
 void
-safe_croak(LhaStash * stash, unsigned char * dying_message)
+safe_croak(LhaStash * stash, char * dying_message)
 {
   destroy_stash(stash);
@@ -40 +40 @@
 
 void
-output(LhaStash * stash, unsigned char * queue, unsigned int len)
+output(LhaStash * stash, unsigned char * queue, int len)
 {
   dSP;
@@ -56 +56 @@
 
 void
-input(LhaStash * stash, unsigned int len)
+input(LhaStash * stash, int len)
 {
   int n;
@@ -86 +86 @@
 {
   return (bit->value << n)
-       + (bit->buf >> (CHAR_BIT - n));
+       + (bit->buf >> (char_bit - n));
 }
 
@@ -99 +99 @@
     if (stash->encoded_size > 0) {
       if (bit->readpos == 0) {
-        if (stash->encoded_size > READBUF_SIZE)
-          len = READBUF_SIZE;
+        if (stash->encoded_size > readbuf_size)
+          len = readbuf_size;
         else
           len = stash->encoded_size;
@@ -106 +106 @@
       }
       bit->buf = bit->readbuf[bit->readpos++];
-      if (bit->readpos == READBUF_SIZE)
+      if (bit->readpos == readbuf_size)
         bit->readpos = 0;
       stash->encoded_size--;
@@ -112 +112 @@
     else
       bit->buf = 0;
-    bit->pos = CHAR_BIT;
+    bit->pos = char_bit;
   }
   bit->pos -= n;
@@ -122 +122 @@
 peekbits(LhaStash * stash, unsigned char n)
 {
-  return (stash->bit->value >> (USHORT_BIT - n));
+  return (stash->bit->value >> (ushort_bit - n));
 }
 
@@ -146 +146 @@
   stash->bit->buf = 0;
   stash->bit->pos = 0;
-  fillbuf(stash, USHORT_BIT);
+  fillbuf(stash, ushort_bit);
 }
 
@@ -158 +158 @@
 make_table(LhaStash * stash, LhaTable * table, unsigned short nchar)
 {
-  unsigned short count[USHORT_BIT + 1];
-  unsigned short weight[USHORT_BIT + 1];
-  unsigned short start[USHORT_BIT + 1];
+  unsigned short count[ushort_bit + 1];
+  unsigned short weight[ushort_bit + 1];
+  unsigned short start[ushort_bit + 1];
   unsigned short total, avail;
   unsigned short from, to;
@@ -168 +168 @@
   unsigned short *p;
 
-  if (table->bit > USHORT_BIT) {
+  if (table->bit > ushort_bit) {
     safe_croak(stash, "Table is broken: table bit is too large");
   }
 
-  for(i = 1; i <= USHORT_BIT; i++) {
+  for(i = 1; i <= ushort_bit; i++) {
     count[i]  = 0;
-    weight[i] = 1 << (USHORT_BIT - i);
+    weight[i] = 1 << (ushort_bit - i);
   }
 
   for(i = 0; i < nchar; i++)
-    if (table->length[i] > USHORT_BIT) {
+    if (table->length[i] > ushort_bit) {
       safe_croak(stash, "Table is broken: bit length is too large");
     }
@@ -185 +185 @@
 
   total = 0;
-  for(i = 1; i <= USHORT_BIT; i++) {
+  for(i = 1; i <= ushort_bit; i++) {
     start[i] = total;
     total += weight[i] * count[i];
   }
-  if (total & USHORT_MAX) {
+  if (total & ushort_max) {
     safe_croak(stash, "Table is broken: total mismatch");
   }
 
-  bits_to_shift = USHORT_BIT - table->bit;
+  bits_to_shift = ushort_bit - table->bit;
   for(i = 1; i <= table->bit; i++) {
     start[i]  >>= bits_to_shift;
@@ -200 +200 @@
 
   from = start[table->bit + 1] >> bits_to_shift;
-  to   = MIN(1 << table->bit, table->size);
+  to   = min(1 << table->bit, table->size);
   if (from)
     for(i = from; i < to; i++)
@@ -212 +212 @@
     l = start[bit] + weight[bit];
     if (bit <= table->bit) {
-      l = MIN(l, table->size);
+      l = min(l, table->size);
       for(j = start[bit]; j < l; j++)
         table->table[j] = i;
@@ -229 +229 @@
           *p = avail++;
         }
-        if (j & USHORT_CENTER)
+        if (j & ushort_center)
           p = &(stash->tree->right[*p]);
         else
@@ -264 +264 @@
   else {
     i = 0;
-    while (i < MIN(n, stash->pt->length_size)) {
+    while (i < min(n, stash->pt->length_size)) {
       c = peekbits(stash, 3);
       if (c != 7)
@@ -305 +305 @@
   else {
     i = 0;
-    while (i < MIN(n, stash->c->length_size)) {
+    while (i < min(n, stash->c->length_size)) {
       c = stash->pt->table[peekbits(stash, stash->pt->bit)];
       if (c >= stash->NT) {
@@ -343 +343 @@
 
   if (stash->bit->blocksize == 0) {
-    stash->bit->blocksize = getbits(stash, USHORT_BIT);
+    stash->bit->blocksize = getbits(stash, ushort_bit);
     read_pt_len(stash, stash->NT, stash->TBIT, 3);
     read_c_len(stash);
@@ -402 +402 @@
 {
   while (len-- > 0)
-    crc = crctable[(crc ^ *str++) & UCHAR_MAX] ^ (crc >> CHAR_BIT);
+    crc = crctable[(crc ^ *str++) & uchar_max] ^ (crc >> char_bit);
   return crc;
 }
@@ -497 +497 @@
     init_bitstream(stash);
 
-    adjust = (1 << UCHAR_BIT) - self_uchar("THRESHOLD");
+    adjust = (1 << uchar_bit) - self_uchar("THRESHOLD");
     crc16  = 0;
     loc    = 0;
@@ -503 +503 @@
     while ( total < stash->original_size ) {
       c = decode_c(stash);
-      if (c <= UCHAR_MAX) {
+      if (c <= uchar_max) {
         queue[loc++] = c;
         if (loc == dicsize) {
@@ -546 +546 @@
 
 unsigned short
-xs_update(unsigned short crc, SV * str, unsigned int len)
+xs_update(unsigned short crc, SV * str, int len)
   CODE:
     RETVAL = calc_crc16(crc, SvPV(str, len), len);