add missing text to output when files are ignored

[rsbs2] / rsb-crc.c

diff --git a/rsb-crc.c b/rsb-crc.c
index d2949caee2305be6a26d91b4af06911fe48a9ec0..8c8fbbeddbb7eeee8d296dca92d64fa210681fb7 100644 (file)
--- a/rsb-crc.c
+++ b/rsb-crc.c
@@ -116,21 +116,10 @@ unsigned int rsb_crc(unsigned int r11_crc, unsigned char *r10_buf, unsigned int
  */
 
 unsigned int rsb_crc2(unsigned char *r0_buf, unsigned int r1_buflen, unsigned int r2_magic, unsigned int *crc_out) {
-       int r8_ret = 1;
-       unsigned int r3_pos = 0xc0000000;
        unsigned int r4_len;
-       unsigned int r5_crc;
-       unsigned int r6;
-       unsigned int r9;
-       unsigned int carry;
-
-#if 0
-       if (r0_buf <= r3_pos)
-               return 1; /* Not in RAM */
-#endif
+       unsigned int file_crc;
 
        r4_len = *(unsigned int*)(r0_buf + 0x20);
-       printf("CRC: length: %d\n", r4_len);
 
        if (*((unsigned int*)(r0_buf + 0x24)) != r2_magic)
                return 2; /* MAGIC does not match */
@@ -138,39 +127,12 @@ unsigned int rsb_crc2(unsigned char *r0_buf, unsigned int r1_buflen, unsigned in
        if (r1_buflen < r4_len)
                return 3; /* image to small */
        
-       r8_ret = 4;
-
-       r3_pos = (unsigned int)r0_buf;
-       r4_len += r3_pos;
-       
-       r5_crc = ~0x0;
-
-       while (r3_pos < r4_len) {
-               r9 = r3_pos & (~0x3);
-               r6 = *((unsigned int*)r9);
-               r9 = r3_pos & 0x3;
-               r9 = r9 << 0x3;
-               r6 = r6 >> r9;
-               r5_crc = r5_crc ^ (r6 << 24);
-               r6 = 0x8;
-
-               do {
-                       carry = r5_crc & 0x80000000;
-                       r5_crc = r5_crc << 1;
-                       if (carry)
-                               r5_crc = r5_crc ^ POLY;
-                       r6--;
-               } while(r6);
-               r3_pos++;
-       }
-
-       r5_crc = ~r5_crc;
-       *crc_out = r5_crc;
+       *crc_out = ~rsb_crc(~0x0, r0_buf, r4_len);
 
-       r3_pos = *((unsigned int*)r4_len);
+       file_crc = *((unsigned int*)(r0_buf + r4_len));
 
-       if (r3_pos == r5_crc)
-               r8_ret = 0;
+       if (file_crc != *crc_out)
+               return 4;
 
-       return r8_ret;
+       return 0;
 }