From ec1ee024adbd673d2422c7640ad16b4cdd5d41f1 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 2 May 2011 23:08:27 -0400 Subject: [PATCH] os: remove race paranoia from Environ(); it's guarded now R=rsc CC=golang-dev https://golang.org/cl/4426077 --- src/pkg/os/env_unix.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/pkg/os/env_unix.go b/src/pkg/os/env_unix.go index 6a8a0b17fe..8aa71e83a0 100644 --- a/src/pkg/os/env_unix.go +++ b/src/pkg/os/env_unix.go @@ -94,14 +94,10 @@ func Environ() []string { a := make([]string, len(env)) i := 0 for k, v := range env { - // check i < len(a) for safety, - // in case env is changing underfoot. - if i < len(a) { - a[i] = k + "=" + v - i++ - } + a[i] = k + "=" + v + i++ } - return a[0:i] + return a } // TempDir returns the default directory to use for temporary files. -- 2.51.0