diff options
| author | Simon Rozman <simon@rozman.si> | 2019-02-04 11:42:51 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-02-05 12:59:42 +0100 |
| commit | e821cdabd2930d301d3a12a5d4d1fe8904cd1c14 (patch) | |
| tree | d9ee36b25e984460fbd8b990d7fc05be4be51758 /setupapi/setupapi_windows.go | |
| parent | 38c7acd70f408e63a70ff45f01d0a22f2c4ac2c7 (diff) | |
Unify certain variable names
Signed-off-by: Simon Rozman <simon@rozman.si>
Diffstat (limited to 'setupapi/setupapi_windows.go')
| -rw-r--r-- | setupapi/setupapi_windows.go | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/setupapi/setupapi_windows.go b/setupapi/setupapi_windows.go index 95c5ba6..f6b35d2 100644 --- a/setupapi/setupapi_windows.go +++ b/setupapi/setupapi_windows.go @@ -104,7 +104,7 @@ func SetupDiGetClassDevsEx(ClassGUID *windows.GUID, Enumerator string, hwndParen } // SetupDiGetDeviceInfoListDetail function retrieves information associated with a device information set including the class GUID, remote computer handle, and remote computer name. -func SetupDiGetDeviceInfoListDetail(DeviceInfoSet DevInfo) (data *DevInfoListDetailData, err error) { +func SetupDiGetDeviceInfoListDetail(DeviceInfoSet DevInfo) (DeviceInfoSetDetailData *DevInfoListDetailData, err error) { var _data _SP_DEVINFO_LIST_DETAIL_DATA _data.Size = uint32(unsafe.Sizeof(_data)) @@ -113,12 +113,11 @@ func SetupDiGetDeviceInfoListDetail(DeviceInfoSet DevInfo) (data *DevInfoListDet return } - data = &DevInfoListDetailData{ + return &DevInfoListDetailData{ ClassGUID: _data.ClassGUID, RemoteMachineHandle: _data.RemoteMachineHandle, RemoteMachineName: windows.UTF16ToString(_data.RemoteMachineName[:]), - } - return + }, nil } // SetupDiEnumDeviceInfo function returns a SP_DEVINFO_DATA structure that specifies a device information element in a device information set. @@ -136,7 +135,7 @@ func SetupDiOpenDevRegKey(DeviceInfoSet DevInfo, DeviceInfoData *SP_DEVINFO_DATA } // SetupDiGetDeviceInstallParams function retrieves device installation parameters for a device information set or a particular device information element. -func SetupDiGetDeviceInstallParams(DeviceInfoSet DevInfo, DeviceInfoData *SP_DEVINFO_DATA) (data *DevInstallParams, err error) { +func SetupDiGetDeviceInstallParams(DeviceInfoSet DevInfo, DeviceInfoData *SP_DEVINFO_DATA) (DeviceInstallParams *DevInstallParams, err error) { var _data _SP_DEVINSTALL_PARAMS _data.Size = uint32(unsafe.Sizeof(_data)) @@ -145,7 +144,7 @@ func SetupDiGetDeviceInstallParams(DeviceInfoSet DevInfo, DeviceInfoData *SP_DEV return } - data = &DevInstallParams{ + return &DevInstallParams{ Flags: _data.Flags, FlagsEx: _data.FlagsEx, hwndParent: _data.hwndParent, @@ -153,8 +152,7 @@ func SetupDiGetDeviceInstallParams(DeviceInfoSet DevInfo, DeviceInfoData *SP_DEV InstallMsgHandlerContext: _data.InstallMsgHandlerContext, FileQueue: _data.FileQueue, DriverPath: windows.UTF16ToString(_data.DriverPath[:]), - } - return + }, nil } // SetupDiSetDeviceInstallParams function sets device installation parameters for a device information set or a particular device information element. |