]> Cypherpunks repositories - gostls13.git/commitdiff
os: don't check non-nil err twice in Symlink on windows
authorTobias Klauser <tklauser@distanz.ch>
Tue, 27 Apr 2021 11:51:45 +0000 (13:51 +0200)
committerTobias Klauser <tobias.klauser@gmail.com>
Tue, 27 Apr 2021 15:50:45 +0000 (15:50 +0000)
Change-Id: I398d324723025b559fdca783fc334de9be68f2d1
Reviewed-on: https://go-review.googlesource.com/c/go/+/314030
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>

src/os/file_windows.go

index 0d3c048a7597c39d07bb0d816dc74d17086d70c5..a2cb96e45737f7320b0615ca5894f1059d8aa43e 100644 (file)
@@ -365,17 +365,14 @@ func Symlink(oldname, newname string) error {
                flags |= syscall.SYMBOLIC_LINK_FLAG_DIRECTORY
        }
        err = syscall.CreateSymbolicLink(n, o, flags)
-
        if err != nil {
                // the unprivileged create flag is unsupported
                // below Windows 10 (1703, v10.0.14972). retry without it.
                flags &^= windows.SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE
-
                err = syscall.CreateSymbolicLink(n, o, flags)
-       }
-
-       if err != nil {
-               return &LinkError{"symlink", oldname, newname, err}
+               if err != nil {
+                       return &LinkError{"symlink", oldname, newname, err}
+               }
        }
        return nil
 }