diff options
| author |   Simon Rozman <simon@rozman.si> | 2019-03-08 09:43:54 +0100 |
|---|---|---|
| committer | Simon Rozman <simon@rozman.si> | 2019-03-08 10:03:57 +0100 |
| commit | 33c35284305e0c70e014bac2bcc3eada070aba26 (patch) | |
| tree | 08ce395d62e83442cc5c8ef3752fb56e65e8ab51 | |
| parent | wintun: Introduce SetupAPI enumerator and machineName consts (diff) | |
| download | wireguard-go-33c35284305e0c70e014bac2bcc3eada070aba26.tar.xz wireguard-go-33c35284305e0c70e014bac2bcc3eada070aba26.zip | |
wintun: Fix double-quoted strings escaping on output
Signed-off-by: Simon Rozman <simon@rozman.si>
| -rw-r--r-- | tun/wintun/setupapi/setupapi_windows.go | 2 | ||||
| -rw-r--r-- | tun/wintun/wintun_windows.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tun/wintun/setupapi/setupapi_windows.go b/tun/wintun/setupapi/setupapi_windows.go index 5f9e05c..486a1ff 100644 --- a/tun/wintun/setupapi/setupapi_windows.go +++ b/tun/wintun/setupapi/setupapi_windows.go @@ -257,7 +257,7 @@ func (deviceInfoSet DevInfo) GetInterfaceID(deviceInfoData *DevInfoData) (*windo // Convert to windows.GUID. ifid, err := guid.FromString(value) if err != nil { - return nil, fmt.Errorf("NetCfgInstanceId registry value is not a GUID (expected: \"{...}\", provided: \"%v\")", value) + return nil, fmt.Errorf("NetCfgInstanceId registry value is not a GUID (expected: \"{...}\", provided: %q)", value) } return ifid, nil diff --git a/tun/wintun/wintun_windows.go b/tun/wintun/wintun_windows.go index eb72447..12fa11c 100644 --- a/tun/wintun/wintun_windows.go +++ b/tun/wintun/wintun_windows.go @@ -216,7 +216,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err } if driverVersion == 0 { - return nil, false, fmt.Errorf("No driver for device \"%v\" installed", hardwareID) + return nil, false, fmt.Errorf("No driver for device %q installed", hardwareID) } // Call appropriate class installer. @@ -266,7 +266,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err // Convert to windows.GUID. ifid, err := guid.FromString(value) if err != nil { - return nil, fmt.Errorf("NetCfgInstanceId registry value is not a GUID (expected: \"{...}\", provided: \"%v\")", value) + return nil, fmt.Errorf("NetCfgInstanceId registry value is not a GUID (expected: \"{...}\", provided: %q)", value) } wintun := (*Wintun)(ifid) @@ -277,7 +277,7 @@ func CreateInterface(description string, hwndParent uintptr) (*Wintun, bool, err return nil, err } - return nil, errors.New(fmt.Sprintf("RegOpenKeyEx(\"%v\") failed: ", keyNetName) + err.Error()) + return nil, errors.New(fmt.Sprintf("RegOpenKeyEx(%q) failed: ", keyNetName) + err.Error()) } defer keyNet.Close() |