diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-06-04 16:29:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-04 16:29:26 -0400 |
| commit | 43db697b46e362e5991005f6c7b8b16ddc9bddbb (patch) | |
| tree | e53320c89cff35f60a1e11e57a0c938f0b793021 /lib/std/net.zig | |
| parent | e498fb155051f548071da1a13098b8793f527275 (diff) | |
| parent | 50a6b0f3acb2a17f74d57301dbf3d4b13e30953b (diff) | |
| download | zig-43db697b46e362e5991005f6c7b8b16ddc9bddbb.tar.gz zig-43db697b46e362e5991005f6c7b8b16ddc9bddbb.zip | |
Merge pull request #11789 from Vexu/stage2
Stage2 fixes towards `zig2 build test-std` working
Diffstat (limited to 'lib/std/net.zig')
| -rw-r--r-- | lib/std/net.zig | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/std/net.zig b/lib/std/net.zig index 0853a08c53..2bd3e6cfb1 100644 --- a/lib/std/net.zig +++ b/lib/std/net.zig @@ -1141,18 +1141,20 @@ fn linuxLookupNameFromHosts( }; defer file.close(); - const stream = std.io.bufferedReader(file.reader()).reader(); + var buffered_reader = std.io.bufferedReader(file.reader()); + const reader = buffered_reader.reader(); var line_buf: [512]u8 = undefined; - while (stream.readUntilDelimiterOrEof(&line_buf, '\n') catch |err| switch (err) { + while (reader.readUntilDelimiterOrEof(&line_buf, '\n') catch |err| switch (err) { error.StreamTooLong => blk: { - // Skip to the delimiter in the stream, to fix parsing - try stream.skipUntilDelimiterOrEof('\n'); + // Skip to the delimiter in the reader, to fix parsing + try reader.skipUntilDelimiterOrEof('\n'); // Use the truncated line. A truncated comment or hostname will be handled correctly. break :blk &line_buf; }, else => |e| return e, }) |line| { - const no_comment_line = mem.split(u8, line, "#").next().?; + var split_it = mem.split(u8, line, "#"); + const no_comment_line = split_it.next().?; var line_it = mem.tokenize(u8, no_comment_line, " \t"); const ip_text = line_it.next() orelse continue; |
