[release-branch.go1] syscall: simplify text returned by Errno.Error() when FormatMess...

««« backport ac7250065a04
syscall: simplify text returned by Errno.Error() when FormatMessage fails

Fixes #3623.

R=golang-dev, bsiegert, rsc
CC=golang-dev
https://golang.org/cl/6218072

»»»

diff --git a/src/pkg/syscall/syscall_windows.go b/src/pkg/syscall/syscall_windows.go
index 978da92ec2e2c63d01835cc6bbd2b1f87a222e33..65ffffa2b9ca9ade0f8a8fec8d118aa08e146fb7 100644 (file)
--- a/src/pkg/syscall/syscall_windows.go
+++ b/src/pkg/syscall/syscall_windows.go
@@ -90,7 +90,9 @@ func (e Errno) Error() string {
        b := make([]uint16, 300)
        n, err := FormatMessage(flags, 0, uint32(e), langid(LANG_ENGLISH, SUBLANG_ENGLISH_US), b, nil)
        if err != nil {
-               return "error " + itoa(int(e)) + " (FormatMessage failed with err=" + itoa(int(err.(Errno))) + ")"
+               // TODO(brainman): Call FormatMessage again asking for "native" error message.
+               // http://code.google.com/p/go/issues/detail?id=3376 must be resolved first.
+               return "winapi error #" + itoa(int(e))
        }
        // trim terminating \r and \n
        for ; n > 0 && (b[n-1] == '\n' || b[n-1] == '\r'); n-- {