mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 05:44:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

std: match readVec fn prototype exactly

Browse source 
this is not necessary according to zig language, but works around a flaw
in the C backend
This commit is contained in:
Andrew Kelley 2025-07-31 14:58:59 -07:00
parent ae67c26cab
commit 111305678c
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/std/Io/Reader.zig
View file

@ -421,7 +421,7 @@ pub fn readVec(r: *Reader, data: [][]u8) Error!usize {
} }
/// Writes to `Reader.buffer` or `data`, whichever has larger capacity. /// Writes to `Reader.buffer` or `data`, whichever has larger capacity.
pub fn defaultReadVec(r: *Reader, data: []const []u8) Error!usize { pub fn defaultReadVec(r: *Reader, data: [][]u8) Error!usize {
assert(r.seek == r.end); assert(r.seek == r.end);
r.seek = 0; r.seek = 0;
r.end = 0; r.end = 0;
@ -1665,7 +1665,7 @@ fn endingStream(r: *Reader, w: *Writer, limit: Limit) StreamError!usize {
return error.EndOfStream; return error.EndOfStream;
} }
fn endingReadVec(r: *Reader, data: []const []u8) Error!usize { fn endingReadVec(r: *Reader, data: [][]u8) Error!usize {
_ = r; _ = r;
_ = data; _ = data;
return error.EndOfStream; return error.EndOfStream;

2
lib/std/compress/flate/Decompress.zig
View file

@ -109,7 +109,7 @@ fn discard(r: *Reader, limit: std.Io.Limit) Reader.Error!usize {
return n; return n;
} }
fn readVec(r: *Reader, data: []const []u8) Reader.Error!usize { fn readVec(r: *Reader, data: [][]u8) Reader.Error!usize {
_ = data; _ = data;
assert(r.seek == r.end); assert(r.seek == r.end);
r.rebase(flate.history_len) catch unreachable; r.rebase(flate.history_len) catch unreachable;

2
lib/std/compress/zstd/Decompress.zig
View file

@ -131,7 +131,7 @@ fn discard(r: *Reader, limit: std.Io.Limit) Reader.Error!usize {
return n; return n;
} }
fn readVec(r: *Reader, data: []const []u8) Reader.Error!usize { fn readVec(r: *Reader, data: [][]u8) Reader.Error!usize {
_ = data; _ = data;
const d: *Decompress = @alignCast(@fieldParentPtr("reader", r)); const d: *Decompress = @alignCast(@fieldParentPtr("reader", r));
assert(r.seek == r.end); assert(r.seek == r.end);

2
lib/std/fs/File.zig
View file

@ -1305,7 +1305,7 @@ pub const Reader = struct {
} }
} }
fn readVec(io_reader: *std.Io.Reader, data: []const []u8) std.Io.Reader.Error!usize { fn readVec(io_reader: *std.Io.Reader, data: [][]u8) std.Io.Reader.Error!usize {
const r: *Reader = @alignCast(@fieldParentPtr("interface", io_reader)); const r: *Reader = @alignCast(@fieldParentPtr("interface", io_reader));
switch (r.mode) { switch (r.mode) {
.positional, .positional_reading => { .positional, .positional_reading => {

2
lib/std/net.zig
View file

@ -1938,7 +1938,7 @@ pub const Stream = struct {
return n; return n;
} }
fn readVec(io_r: *std.Io.Reader, data: []const []u8) Io.Reader.Error!usize { fn readVec(io_r: *std.Io.Reader, data: [][]u8) Io.Reader.Error!usize {
const r: *Reader = @alignCast(@fieldParentPtr("interface_state", io_r)); const r: *Reader = @alignCast(@fieldParentPtr("interface_state", io_r));
var iovecs: [max_buffers_len]windows.ws2_32.WSABUF = undefined; var iovecs: [max_buffers_len]windows.ws2_32.WSABUF = undefined;
const bufs_n, const data_size = try io_r.writableVectorWsa(&iovecs, data); const bufs_n, const data_size = try io_r.writableVectorWsa(&iovecs, data);