diff options
| author | Simon Rozman <simon@rozman.si> | 2019-03-04 14:27:16 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-03-04 16:37:11 +0100 |
| commit | 1fdf7b19a3b7237ad7e63ae3e08d77686649ec0e (patch) | |
| tree | 124165516dbcfbb6dabaf630b38dd355b96667aa /tun/wintun/setupapi/setupapi_windows.go | |
| parent | a1aabb21ae83652e581ccbc0b379c2781c768932 (diff) | |
wintun: Resolve some of golint warnings
Signed-off-by: Simon Rozman <simon@rozman.si>
Diffstat (limited to 'tun/wintun/setupapi/setupapi_windows.go')
| -rw-r--r-- | tun/wintun/setupapi/setupapi_windows.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tun/wintun/setupapi/setupapi_windows.go b/tun/wintun/setupapi/setupapi_windows.go index f736af5..71732a4 100644 --- a/tun/wintun/setupapi/setupapi_windows.go +++ b/tun/wintun/setupapi/setupapi_windows.go @@ -398,10 +398,10 @@ func SetupDiClassNameFromGuidEx(classGUID *windows.GUID, machineName string) (cl //sys setupDiClassGuidsFromNameEx(className *uint16, classGuidList *windows.GUID, classGuidListSize uint32, requiredSize *uint32, machineName *uint16, reserved uintptr) (err error) = setupapi.SetupDiClassGuidsFromNameExW // SetupDiClassGuidsFromNameEx function retrieves the GUIDs associated with the specified class name. This resulting list contains the classes currently installed on a local or remote computer. -func SetupDiClassGuidsFromNameEx(className string, machineName string) (classGuidLists []windows.GUID, err error) { +func SetupDiClassGuidsFromNameEx(className string, machineName string) ([]windows.GUID, error) { classNameUTF16, err := syscall.UTF16PtrFromString(className) if err != nil { - return + return nil, err } const bufCapacity = 4 @@ -412,7 +412,7 @@ func SetupDiClassGuidsFromNameEx(className string, machineName string) (classGui if machineName != "" { machineNameUTF16, err = syscall.UTF16PtrFromString(machineName) if err != nil { - return + return nil, err } } @@ -431,7 +431,7 @@ func SetupDiClassGuidsFromNameEx(className string, machineName string) (classGui } } - return + return nil, err } //sys setupDiGetSelectedDevice(deviceInfoSet DevInfo, deviceInfoData *DevInfoData) (err error) = setupapi.SetupDiGetSelectedDevice |