From 50617c2ba19781ae46f34bb505064996b8fa32e8 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 3 Mar 2021 12:23:36 +0100 Subject: [PATCH] windows/mkwinsyscall: use "windows." prefix when referring to NTStatus All references to "Errno" go through the syscalldot function, which prepends "syscall." if the generation target is not in the syscall package. Similarly so, we need a windowsdot function to prepend "windows." to NTStatus. Change-Id: I86affcf0155632ed5848ebabca97d175a041c6c3 Reviewed-on: https://go-review.googlesource.com/c/sys/+/298170 Trust: Jason A. Donenfeld Run-TryBot: Jason A. Donenfeld TryBot-Result: Go Bot Reviewed-by: Brad Fitzpatrick --- windows/mkwinsyscall/mkwinsyscall.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/windows/mkwinsyscall/mkwinsyscall.go b/windows/mkwinsyscall/mkwinsyscall.go index dfe5d4fb..5818e84c 100644 --- a/windows/mkwinsyscall/mkwinsyscall.go +++ b/windows/mkwinsyscall/mkwinsyscall.go @@ -82,6 +82,13 @@ func packagename() string { return packageName } +func windowsdot() string { + if packageName == "windows" { + return "" + } + return "windows." +} + func syscalldot() string { if packageName == "syscall" { return "" @@ -319,7 +326,7 @@ func (r *Rets) SetErrorCode() string { %s = %sErrno(r0) }` const ntstatus = `if r0 != 0 { - ntstatus = NTStatus(r0) + ntstatus = %sNTStatus(r0) }` if r.Name == "" && !r.ReturnsError { return "" @@ -328,7 +335,7 @@ func (r *Rets) SetErrorCode() string { return r.useLongHandleErrorCode("r1") } if r.Type == "error" && r.Name == "ntstatus" { - return ntstatus + return fmt.Sprintf(ntstatus, windowsdot()) } if r.Type == "error" { return fmt.Sprintf(code, r.Name, syscalldot())