From: Alex Brainman <alex.brainman@gmail.com>
Date: Wed, 13 Jun 2012 20:24:22 +0000 (-0400)
Subject: [release-branch.go1] syscall: simplify text returned by Errno.Error() when FormatMess... 
X-Git-Tag: go1.0.2~51
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6835ec91dd7002b16039317e539254e5a9f005d8;p=gostls13.git

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

««« 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 978da92ec2..65ffffa2b9 100644
--- 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-- {