authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-29 16:18:52-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-31 22:10:11-07:00
log6bcced31a04afeeead065af961f2571a95e4ad21
treeb392b4cb264bb16c0b8b59964589cb3939580861
parent42b10f08ccfa8d4912761371a470cf43bec0ae4e

fix 32-bit compilation

2 files changed, 4 insertions(+), 4 deletions(-)

lib/std/compress/flate/Decompress.zig+2-2
...@@ -457,7 +457,7 @@ fn specialPeek(in: *Reader, next_bits: usize, i: usize) Reader.Error!u8 {...@@ -457,7 +457,7 @@ fn specialPeek(in: *Reader, next_bits: usize, i: usize) Reader.Error!u8 {
457 return peeked[i];457 return peeked[i];
458}458}
459459
460fn tossBits(d: *Decompress, n: u6) !void {460fn tossBits(d: *Decompress, n: u4) !void {
461 const remaining_bits = d.remaining_bits;461 const remaining_bits = d.remaining_bits;
462 const next_bits = d.next_bits;462 const next_bits = d.next_bits;
463 if (remaining_bits >= n) {463 if (remaining_bits >= n) {
...@@ -475,7 +475,7 @@ fn tossBits(d: *Decompress, n: u6) !void {...@@ -475,7 +475,7 @@ fn tossBits(d: *Decompress, n: u6) !void {
475 }475 }
476}476}
477477
478fn tossBitsEnding(d: *Decompress, n: u6) !void {478fn tossBitsEnding(d: *Decompress, n: u4) !void {
479 const remaining_bits = d.remaining_bits;479 const remaining_bits = d.remaining_bits;
480 const in = d.input;480 const in = d.input;
481 const buffered_n = in.bufferedLen();481 const buffered_n = in.bufferedLen();
lib/std/zip.zig+2-2
...@@ -577,7 +577,7 @@ pub const Iterator = struct {...@@ -577,7 +577,7 @@ pub const Iterator = struct {
577577
578 switch (self.compression_method) {578 switch (self.compression_method) {
579 .store => {579 .store => {
580 stream.interface.streamExact(&file_writer.interface, self.uncompressed_size) catch |err| switch (err) {580 stream.interface.streamExact64(&file_writer.interface, self.uncompressed_size) catch |err| switch (err) {
581 error.ReadFailed => return stream.err.?,581 error.ReadFailed => return stream.err.?,
582 error.WriteFailed => return file_writer.err.?,582 error.WriteFailed => return file_writer.err.?,
583 error.EndOfStream => return error.ZipDecompressTruncated,583 error.EndOfStream => return error.ZipDecompressTruncated,
...@@ -586,7 +586,7 @@ pub const Iterator = struct {...@@ -586,7 +586,7 @@ pub const Iterator = struct {
586 .deflate => {586 .deflate => {
587 var flate_buffer: [flate.max_window_len]u8 = undefined;587 var flate_buffer: [flate.max_window_len]u8 = undefined;
588 var decompress: flate.Decompress = .init(&stream.interface, .raw, &flate_buffer);588 var decompress: flate.Decompress = .init(&stream.interface, .raw, &flate_buffer);
589 decompress.reader.streamExact(&file_writer.interface, self.uncompressed_size) catch |err| switch (err) {589 decompress.reader.streamExact64(&file_writer.interface, self.uncompressed_size) catch |err| switch (err) {
590 error.ReadFailed => return stream.err.?,590 error.ReadFailed => return stream.err.?,
591 error.WriteFailed => return file_writer.err orelse decompress.err.?,591 error.WriteFailed => return file_writer.err orelse decompress.err.?,
592 error.EndOfStream => return error.ZipDecompressTruncated,592 error.EndOfStream => return error.ZipDecompressTruncated,