From: Tobias Klauser Date: Thu, 26 Oct 2017 08:10:25 +0000 (+0200) Subject: syscall: simplify return in Futimesat and Mount X-Git-Tag: go1.10beta1~571 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=dc97f4103cbeac291ec6685d9f0d4e621fe4e133;p=gostls13.git syscall: simplify return in Futimesat and Mount Directly return error instead of assigning to err and then returning. Change-Id: Ie5c466cac70cc6d52ee72ebba3e497e0da8a5797 Reviewed-on: https://go-review.googlesource.com/73531 Run-TryBot: Tobias Klauser TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- diff --git a/src/syscall/syscall_linux.go b/src/syscall/syscall_linux.go index 83bfee46a0..3fb9b1aa3f 100644 --- a/src/syscall/syscall_linux.go +++ b/src/syscall/syscall_linux.go @@ -126,8 +126,7 @@ func Futimesat(dirfd int, path string, tv []Timeval) (err error) { if err != nil { return err } - err = futimesat(dirfd, pathp, (*[2]Timeval)(unsafe.Pointer(&tv[0]))) - return err + return futimesat(dirfd, pathp, (*[2]Timeval)(unsafe.Pointer(&tv[0]))) } func Futimes(fd int, tv []Timeval) (err error) { @@ -801,8 +800,7 @@ func Mount(source string, target string, fstype string, flags uintptr, data stri if err != nil { return err } - err = mount(source, target, fstype, flags, datap) - return err + return mount(source, target, fstype, flags, datap) } // Sendto