remove last register named variables. now it's readable and even still works :-)

[rsbs2] / rsb-lz.c

diff --git a/rsb-lz.c b/rsb-lz.c
index 644e8bb0e98976998edf1cada054297e678721ad..93e9d79f2acfd41001d31febb9b4412f97b55ed6 100644 (file)
--- a/rsb-lz.c
+++ b/rsb-lz.c
@@ -15,10 +15,10 @@ void err_exit(const char *fname)
 }
 
 struct data_in_s {
-       unsigned char *start; /* 0 */
-       unsigned char *stop; /* 4 */
-       unsigned char bit; /* 8 */
-       unsigned char x; /* 9 */
+       unsigned char *start;
+       unsigned char *stop;
+       unsigned char bitpos;
+       unsigned char byte;
 };
 
 struct data_out_s {
@@ -39,52 +39,53 @@ unsigned char get_next_in_byte(struct data_in_s *data_in)
        return byte;
 }
 
-unsigned char fn_59848(struct data_in_s *data_in)
+unsigned char get_next_bit(struct data_in_s *data_in)
 {
-       unsigned char r5;
+       unsigned char bitval;
 
-       if (data_in->bit == 0x80) {
-               data_in->x = get_next_in_byte(data_in);
+       if (data_in->bitpos == 0x80) {
+               data_in->byte = get_next_in_byte(data_in);
        }
 
-       r5 = data_in->bit & data_in->x;
+       bitval = data_in->bitpos & data_in->byte;
 
-       data_in->bit >>= 1;
-       if (data_in->bit == 0) {
-               data_in->bit = 0x80;
+       data_in->bitpos >>= 1;
+       if (data_in->bitpos == 0) {
+               data_in->bitpos = 0x80;
        }
 
-       if (r5 == 0)
+       if (bitval == 0)
                return 0;
 
        return 1;
 }
 
-unsigned int fn_598b4(struct data_in_s *r11_data, unsigned int r10_arg2)
+unsigned int get_next_bits(struct data_in_s *data_in, unsigned int bits)
 {
-       unsigned int r6;
-       unsigned int r7;
+       unsigned int bit;
+       unsigned int next_bits;
 
-       r6 = 1 << (r10_arg2 - 1);
+       bit = 1 << (bits - 1);
 
-       r7 = 0;
-       while (r6 != 0) {
-               if (r11_data->bit == 0x80) {
-                       r11_data->x = get_next_in_byte(r11_data);
+       next_bits = 0;
+       while (bit != 0) {
+               if (data_in->bitpos == 0x80) {
+                       data_in->byte = get_next_in_byte(data_in);
                }
-               if ((r11_data->bit & r11_data->x) != 0)
-                       r7 = r7 | r6;
 
-               r6 = r6 >> 1;
+               if ((data_in->bitpos & data_in->byte) != 0)
+                       next_bits = next_bits | bit;
+
+               bit = bit >> 1;
 
-               r11_data->bit >>= 1;
+               data_in->bitpos >>= 1;
 
-               if(r11_data->bit == 0) {
-                       r11_data->bit = 0x80;
+               if(data_in->bitpos == 0) {
+                       data_in->bitpos = 0x80;
                }
        }
 
-       return r7;
+       return next_bits;
 }
 
 void write_byte(unsigned char byte, struct data_out_s *data_out)
@@ -97,45 +98,39 @@ void write_byte(unsigned char byte, struct data_out_s *data_out)
        data_out->pos++;
 }
 
-void lz_expand(struct data_in_s *r10_data, struct data_out_s *data_out)
+void lz_expand(struct data_in_s *data_in, struct data_out_s *data_out)
 {
-       unsigned int r5;
-       unsigned int r2;
-       unsigned char r4;
-       unsigned int r6;
-       unsigned int r7;
-       unsigned int r11;
-       unsigned char arr_59b64[1024];
+       unsigned int pos;
+       unsigned int offset;
+       unsigned int i;
+       unsigned char byte;
+       unsigned int num;
+       unsigned char buf[1024];
 
-       r5 = 1;
+       pos = 1;
 
        while (1) {
                while (1) {
-                       r2 = fn_59848(r10_data);
-                       if (r2 == 0)
+                       if (get_next_bit(data_in) == 0)
                                break;
 
-                       r2 = fn_598b4(r10_data, 8) & 0xff;
+                       byte = get_next_bits(data_in, 8);
 
-                       write_byte(r2, data_out);
-                       arr_59b64[r5] = r2 & 0xff;
-                       r5 = (r5 + 1) & 0x3ff;
+                       write_byte(byte, data_out);
+                       buf[pos] = byte;
+                       pos = (pos + 1) & 0x3ff;
                }
 
-               r11 = fn_598b4(r10_data, 0x0a);
-               if(r11 == 0)
+               offset = get_next_bits(data_in, 0x0a);
+               if(offset == 0)
                        return;
 
-               r2 = fn_598b4(r10_data, 0x04);
-               r7 = r2 + 1;
-               r6 = 0;
-               while (r6 <= r7) {
-                       r2 = (r6 + r11) & 0x3ff;
-                       r4 = arr_59b64[r2];
-                       write_byte(r4, data_out);
-                       arr_59b64[r5] = r4;
-                       r5 = (r5 + 1) & 0x3ff;
-                       r6++;
+               num = get_next_bits(data_in, 0x04) + 1;
+               for (i = 0; i <= num; i++) {
+                       byte = buf[(offset + i) & 0x3ff];
+                       write_byte(byte, data_out);
+                       buf[pos] = byte;
+                       pos = (pos + 1) & 0x3ff;
                }
        }
 }
@@ -199,8 +194,8 @@ void extract_lz_file(unsigned char *inbuf, unsigned char *name)
 
        data_in.start = inbuf + 8;
        data_in.stop = inbuf + len;
-       data_in.x = 0;
-       data_in.bit = 0x80;
+       data_in.byte = 0x00;
+       data_in.bitpos = 0x80;
 
        data_out.pos = outbuf;
        data_out.end = outbuf + len;