aboutsummaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/dnsclient_unix_test.go2
-rw-r--r--src/net/http/cookiejar/jar.go2
-rw-r--r--src/net/http/fs.go6
-rw-r--r--src/net/interface_linux_test.go4
-rw-r--r--src/net/internal/socktest/switch.go2
5 files changed, 9 insertions, 7 deletions
diff --git a/src/net/dnsclient_unix_test.go b/src/net/dnsclient_unix_test.go
index 0da36303cc..2889a2c389 100644
--- a/src/net/dnsclient_unix_test.go
+++ b/src/net/dnsclient_unix_test.go
@@ -1054,7 +1054,7 @@ func testRotate(t *testing.T, rotate bool, nameservers, wantServers []string) {
}
defer conf.teardown()
- var confLines []string
+ confLines := make([]string, 0, len(nameservers))
for _, ns := range nameservers {
confLines = append(confLines, "nameserver "+ns)
}
diff --git a/src/net/http/cookiejar/jar.go b/src/net/http/cookiejar/jar.go
index 59cde82cb3..8a6b34ced8 100644
--- a/src/net/http/cookiejar/jar.go
+++ b/src/net/http/cookiejar/jar.go
@@ -184,7 +184,7 @@ func (j *Jar) cookies(u *url.URL, now time.Time) (cookies []*http.Cookie) {
}
modified := false
- var selected []entry
+ selected := make([]entry, 0, len(submap))
for id, e := range submap {
if e.Persistent && !e.Expires.After(now) {
delete(submap, id)
diff --git a/src/net/http/fs.go b/src/net/http/fs.go
index af7511a7a4..45187eea14 100644
--- a/src/net/http/fs.go
+++ b/src/net/http/fs.go
@@ -961,9 +961,11 @@ func parseRange(s string, size int64) ([]httpRange, error) {
if !strings.HasPrefix(s, b) {
return nil, errors.New("invalid range")
}
- var ranges []httpRange
+
+ splits := strings.Split(s[len(b):], ",")
+ ranges := make([]httpRange, 0, len(splits))
noOverlap := false
- for _, ra := range strings.Split(s[len(b):], ",") {
+ for _, ra := range splits {
ra = textproto.TrimString(ra)
if ra == "" {
continue
diff --git a/src/net/interface_linux_test.go b/src/net/interface_linux_test.go
index 0699fec636..a9b274cd02 100644
--- a/src/net/interface_linux_test.go
+++ b/src/net/interface_linux_test.go
@@ -113,7 +113,7 @@ func TestParseProcNet(t *testing.T) {
}
}()
- var ifmat4 []Addr
+ ifmat4 := make([]Addr, 0, len(igmpInterfaceTable))
for _, ifi := range igmpInterfaceTable {
ifmat := parseProcNetIGMP("testdata/igmp", &ifi)
ifmat4 = append(ifmat4, ifmat...)
@@ -122,7 +122,7 @@ func TestParseProcNet(t *testing.T) {
t.Fatalf("got %d; want %d", len(ifmat4), numOfTestIPv4MCAddrs)
}
- var ifmat6 []Addr
+ ifmat6 := make([]Addr, 0, len(igmp6InterfaceTable))
for _, ifi := range igmp6InterfaceTable {
ifmat := parseProcNetIGMP6("testdata/igmp6", &ifi)
ifmat6 = append(ifmat6, ifmat...)
diff --git a/src/net/internal/socktest/switch.go b/src/net/internal/socktest/switch.go
index dea6d9288c..1eb39b99ad 100644
--- a/src/net/internal/socktest/switch.go
+++ b/src/net/internal/socktest/switch.go
@@ -31,8 +31,8 @@ func (sw *Switch) init() {
// Stats returns a list of per-cookie socket statistics.
func (sw *Switch) Stats() []Stat {
- var st []Stat
sw.smu.RLock()
+ st := make([]Stat, 0, len(sw.stats))
for _, s := range sw.stats {
ns := *s
st = append(st, ns)