diff --git a/archive/unrar.js b/archive/unrar.js index fcad87e..d8d0a38 100644 --- a/archive/unrar.js +++ b/archive/unrar.js @@ -187,12 +187,13 @@ class RarVolumeHeader { if ((rmode & 8) == 0) { continue; } - if (I != 0) + if (I != 0) { bstream.readBits(16); - const count = (rmode & 3); - for (let J = 0; J < count; ++J) { - bstream.readBits(8); - } + } + const count = (rmode & 3); + for (let J = 0; J < count; ++J) { + bstream.readBits(8); + } } } @@ -330,15 +331,14 @@ function RarReadTables(bstream) { let ZeroCount = bstream.readBits(4); if (ZeroCount == 0) { BitLength[I] = 15; - } - else { + } else { ZeroCount += 2; - while (ZeroCount-- > 0 && I < rBC) + while (ZeroCount-- > 0 && I < rBC) { BitLength[I++] = 0; + } --I; } - } - else { + } else { BitLength[I] = Length; } } @@ -1303,9 +1303,9 @@ const unrar = function(arrayBuffer) { const header = new RarVolumeHeader(bstream); if (header.crc == 0x6152 && - header.headType == 0x72 && - header.flags.value == 0x1A21 && - header.headSize == 7) { + header.headType == 0x72 && + header.flags.value == 0x1A21 && + header.headSize == 7) { info("Found RAR signature"); const mhead = new RarVolumeHeader(bstream); diff --git a/io/bitstream.js b/io/bitstream.js index 28b7dbc..e1077d4 100644 --- a/io/bitstream.js +++ b/io/bitstream.js @@ -25,8 +25,8 @@ bitjs.io.BitStream = class { * @param {Number} opt_length The length of this BitStream */ constructor(ab, rtl, opt_offset, opt_length) { - if (!ab || !ab.toString || ab.toString() !== "[object ArrayBuffer]") { - throw "Error! BitArray constructed with an invalid ArrayBuffer object"; + if (!ab || !ab.toString || ab.toString() !== '[object ArrayBuffer]') { + throw 'Error! BitArray constructed with an invalid ArrayBuffer object'; } const offset = opt_offset || 0; @@ -65,8 +65,8 @@ bitjs.io.BitStream = class { // This could be considerably faster when reading more than 3 or 4 bits at a time. while (n > 0) { if (bytePtr >= bytes.length) { - throw "Error! Overflowed the bit stream! n=" + n + ", bytePtr=" + bytePtr + ", bytes.length=" + - bytes.length + ", bitPtr=" + bitPtr; + throw 'Error! Overflowed the bit stream! n=' + n + ', bytePtr=' + bytePtr + ', bytes.length=' + + bytes.length + ', bitPtr=' + bitPtr; return -1; } @@ -125,8 +125,8 @@ bitjs.io.BitStream = class { // This could be considerably faster when reading more than 3 or 4 bits at a time. while (n > 0) { if (bytePtr >= bytes.length) { - throw "Error! Overflowed the bit stream! n=" + n + ", bytePtr=" + bytePtr + ", bytes.length=" + - bytes.length + ", bitPtr=" + bitPtr; + throw 'Error! Overflowed the bit stream! n=' + n + ', bytePtr=' + bytePtr + ', bytes.length=' + + bytes.length + ', bitPtr=' + bitPtr; return -1; } diff --git a/tests/io-test.html b/tests/io-test.html index 9d814f2..cfbbba3 100644 --- a/tests/io-test.html +++ b/tests/io-test.html @@ -9,66 +9,66 @@