Commit 042848da authored by Alex Brainman's avatar Alex Brainman

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
parent dcc80e45
...@@ -90,7 +90,9 @@ func (e Errno) Error() string { ...@@ -90,7 +90,9 @@ func (e Errno) Error() string {
b := make([]uint16, 300) b := make([]uint16, 300)
n, err := FormatMessage(flags, 0, uint32(e), langid(LANG_ENGLISH, SUBLANG_ENGLISH_US), b, nil) n, err := FormatMessage(flags, 0, uint32(e), langid(LANG_ENGLISH, SUBLANG_ENGLISH_US), b, nil)
if err != 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 // trim terminating \r and \n
for ; n > 0 && (b[n-1] == '\n' || b[n-1] == '\r'); n-- { for ; n > 0 && (b[n-1] == '\n' || b[n-1] == '\r'); n-- {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment