diff options
| author | Bryan C. Mills <bcmills@google.com> | 2022-12-09 12:30:24 -0500 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2023-01-25 03:23:11 +0000 |
| commit | e216ee7e7416df48dc9550a6f18552a4ada5d419 (patch) | |
| tree | e0bd79351dd2a0e4dbdbd154120a42f1161bb8ce /src/syscall/exec_plan9.go | |
| parent | 01636cf3fd35787cf6df449414d5db00b3e89692 (diff) | |
| download | go-e216ee7e7416df48dc9550a6f18552a4ada5d419.tar.xz | |
syscall: clean up variable declarations in forkAndExecInChild
The various forkAndExecInChild implementations have comments
explaining that they pre-declare variables to force allocations
to occur before forking, but then later use ":=" declarations
for additional variables.
To make it clearer that those ":=" declarations do not allocate,
we move their declarations up to the predeclared blocks.
For #57208.
Change-Id: Ie8cb577fa7180b51b64d6dc398169053fdf8ea97
Reviewed-on: https://go-review.googlesource.com/c/go/+/456516
Auto-Submit: Bryan Mills <bcmills@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Run-TryBot: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Diffstat (limited to 'src/syscall/exec_plan9.go')
| -rw-r--r-- | src/syscall/exec_plan9.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/syscall/exec_plan9.go b/src/syscall/exec_plan9.go index 8f28b5aa22..8762237825 100644 --- a/src/syscall/exec_plan9.go +++ b/src/syscall/exec_plan9.go @@ -135,6 +135,8 @@ func forkAndExecInChild(argv0 *byte, argv []*byte, envv []envItem, dir *byte, at errbuf [ERRMAX]byte statbuf [STATMAX]byte dupdevfd int + n int + b []byte ) // Guard against side effects of shuffling fds below. @@ -177,14 +179,14 @@ func forkAndExecInChild(argv0 *byte, argv []*byte, envv []envItem, dir *byte, at dirloop: for { r1, _, _ = RawSyscall6(SYS_PREAD, uintptr(dupdevfd), uintptr(unsafe.Pointer(&statbuf[0])), uintptr(len(statbuf)), ^uintptr(0), ^uintptr(0), 0) - n := int(r1) + n = int(r1) switch n { case -1: goto childerror case 0: break dirloop } - for b := statbuf[:n]; len(b) > 0; { + for b = statbuf[:n]; len(b) > 0; { var s []byte s, b = gdirname(b) if s == nil { |