diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-04-03 22:31:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 22:31:15 -0400 |
| commit | e89c42655cf9851cdf02065bc75cda0e27884966 (patch) | |
| tree | b25e26e53ceda1ac03e65de5d483491ee46e7c0e /lib/std/net.zig | |
| parent | 1568470c44eafb59425c070ea9884b78cc2516b2 (diff) | |
| parent | 7a28c644aa8eb3d27dee113338af8278f8f6334f (diff) | |
| download | zig-e89c42655cf9851cdf02065bc75cda0e27884966.tar.gz zig-e89c42655cf9851cdf02065bc75cda0e27884966.zip | |
Merge pull request #4868 from xackus/new-arraylist-api
new ArrayList API
Diffstat (limited to 'lib/std/net.zig')
| -rw-r--r-- | lib/std/net.zig | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/std/net.zig b/lib/std/net.zig index 0f7118c331..f91b2b86aa 100644 --- a/lib/std/net.zig +++ b/lib/std/net.zig @@ -509,7 +509,7 @@ pub fn getAddressList(allocator: *mem.Allocator, name: []const u8, port: u16) !* try linuxLookupName(&lookup_addrs, &canon, name, family, flags, port); - result.addrs = try arena.alloc(Address, lookup_addrs.len); + result.addrs = try arena.alloc(Address, lookup_addrs.items.len); if (!canon.isNull()) { result.canon_name = canon.toOwnedSlice(); } @@ -554,7 +554,7 @@ fn linuxLookupName( return name_err; } else { try linuxLookupNameFromHosts(addrs, canon, name, family, port); - if (addrs.len == 0) { + if (addrs.items.len == 0) { try linuxLookupNameFromDnsSearch(addrs, canon, name, family, port); } } @@ -562,11 +562,11 @@ fn linuxLookupName( try canon.resize(0); try linuxLookupNameFromNull(addrs, family, flags, port); } - if (addrs.len == 0) return error.UnknownHostName; + if (addrs.items.len == 0) return error.UnknownHostName; // No further processing is needed if there are fewer than 2 // results or if there are only IPv4 results. - if (addrs.len == 1 or family == os.AF_INET) return; + if (addrs.items.len == 1 or family == os.AF_INET) return; const all_ip4 = for (addrs.span()) |addr| { if (addr.addr.any.family != os.AF_INET) break false; } else true; @@ -908,7 +908,7 @@ fn linuxLookupNameFromDnsSearch( canon.shrink(canon_name.len + 1); try canon.appendSlice(tok); try linuxLookupNameFromDns(addrs, canon, canon.span(), family, rc, port); - if (addrs.len != 0) return; + if (addrs.items.len != 0) return; } canon.shrink(canon_name.len); @@ -967,7 +967,7 @@ fn linuxLookupNameFromDns( dnsParse(ap[i], ctx, dnsParseCallback) catch {}; } - if (addrs.len != 0) return; + if (addrs.items.len != 0) return; if (ap[0].len < 4 or (ap[0][3] & 15) == 2) return error.TemporaryNameServerFailure; if ((ap[0][3] & 15) == 0) return error.UnknownHostName; if ((ap[0][3] & 15) == 3) return; @@ -1049,7 +1049,7 @@ fn getResolvConf(allocator: *mem.Allocator, rc: *ResolvConf) !void { } } - if (rc.ns.len == 0) { + if (rc.ns.items.len == 0) { return linuxLookupNameFromNumericUnspec(&rc.ns, "127.0.0.1", 53); } } @@ -1078,7 +1078,7 @@ fn resMSendRc( var ns_list = std.ArrayList(Address).init(rc.ns.allocator); defer ns_list.deinit(); - try ns_list.resize(rc.ns.len); + try ns_list.resize(rc.ns.items.len); const ns = ns_list.span(); for (rc.ns.span()) |iplit, i| { |