GitHubMirror/sys
1
0
Fork 0
mirror of https://github.com/rwinkhart/sys.git synced 2026-09-03 15:47:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

windows: address vet reports

Browse Source 
Found in https://storage.googleapis.com/go-build-log/300ed876/misc-vet-vetall_dd96a388.log

cmd/vendor/golang.org/x/sys/windows/asm_windows_386.s:9: [386] getprocaddress: wrong argument size 8; expected $...-16
cmd/vendor/golang.org/x/sys/windows/asm_windows_386.s:12: [386] loadlibrary: wrong argument size 4; expected $...-12
cmd/vendor/golang.org/x/sys/windows/svc/service.go:337: cmd/vendor/golang.org/x/sys/windows.SERVICE_TABLE_ENTRY composite literal uses unkeyed fields
cmd/vendor/golang.org/x/sys/windows/svc/service.go:338: cmd/vendor/golang.org/x/sys/windows.SERVICE_TABLE_ENTRY composite literal uses unkeyed fields
cmd/vendor/golang.org/x/sys/windows/svc/debug/service.go:34: cmd/vendor/golang.org/x/sys/windows/svc.ChangeRequest composite literal uses unkeyed fields
cmd/vendor/golang.org/x/sys/windows/svc/mgr/config.go:124: cmd/vendor/golang.org/x/sys/windows.SERVICE_DESCRIPTION composite literal uses unkeyed fields

Change-Id: Ic08cfcc802aac89cfa1eb98661ec556c844e8013
Reviewed-on: https://go-review.googlesource.com/112557
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Hana (Hyang-Ah) Kim
2018-05-10 03:28:50 +00:00
committed by Brad Fitzpatrick
parent 64746a42f3
commit 7dfd1290c7
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
windows/asm_windows_386.s
+2 -2
View File
@@ -6,8 +6,8 @@
// System calls for 386, Windows are implemented in runtime/syscall_windows.goc // System calls for 386, Windows are implemented in runtime/syscall_windows.goc
// //
TEXT ·getprocaddress(SB), 7, $0-8 TEXT ·getprocaddress(SB), 7, $0-16
JMP syscall·getprocaddress(SB) JMP syscall·getprocaddress(SB)
TEXT ·loadlibrary(SB), 7, $0-4 TEXT ·loadlibrary(SB), 7, $0-12
JMP syscall·loadlibrary(SB) JMP syscall·loadlibrary(SB)
windows/svc/debug/service.go
+1 -1
View File
@@ -31,7 +31,7 @@ func Run(name string, handler svc.Handler) error {
for { for {
select { select {
case <-sig: case <-sig:
cmds <- svc.ChangeRequest{svc.Stop, 0, 0, status} cmds <- svc.ChangeRequest{Cmd: svc.Stop, CurrentStatus: status}
case status = <-changes: case status = <-changes:
} }
} }
windows/svc/mgr/config.go
+1 -1
View File
@@ -121,7 +121,7 @@ func (s *Service) Config() (Config, error) {
} }
func updateDescription(handle windows.Handle, desc string) error { func updateDescription(handle windows.Handle, desc string) error {
d := windows.SERVICE_DESCRIPTION{toPtr(desc)} d := windows.SERVICE_DESCRIPTION{Description: toPtr(desc)}
return windows.ChangeServiceConfig2(handle, return windows.ChangeServiceConfig2(handle,
windows.SERVICE_CONFIG_DESCRIPTION, (*byte)(unsafe.Pointer(&d))) windows.SERVICE_CONFIG_DESCRIPTION, (*byte)(unsafe.Pointer(&d)))
} }
windows/svc/service.go
+2 -2
View File
@@ -334,8 +334,8 @@ func Run(name string, handler Handler) error {
var svcmain uintptr var svcmain uintptr
getServiceMain(&svcmain) getServiceMain(&svcmain)
t := []windows.SERVICE_TABLE_ENTRY{ t := []windows.SERVICE_TABLE_ENTRY{
{syscall.StringToUTF16Ptr(s.name), svcmain}, {ServiceName: syscall.StringToUTF16Ptr(s.name), ServiceProc: svcmain},
{nil, 0}, {ServiceName: nil, ServiceProc: 0},
} }
goWaitsH = uintptr(s.goWaits.h) goWaitsH = uintptr(s.goWaits.h)