wintun: Fix double-quoted strings escaping on output

Signed-off-by: Simon Rozman <simon@rozman.si>

diff --git a/tun/wintun/setupapi/setupapi_windows.go b/tun/wintun/setupapi/setupapi_windows.go
index 5f9e05c0564744cc2516f18ec85a17b6eda03388..486a1ffcf71fe1f40f82532d530ff86aef36404b 100644 (file)
--- 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 eb7244733dc4f79b04ad5cc54b0290d0a08ea695..12fa11c38b71baafd5e2076fafb34b9e14cfe344 100644 (file)
--- 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()