aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-06-13 11:05:52 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-06-13 11:05:52 +0200
commitc98a987e21e711f403c45062e56503e3c65bce47 (patch)
tree5f40fc0c90d204df61d40cadafc9a930376ddab5
parentconf: safely escape weird input characters (diff)
downloadwireguard-windows-c98a987e21e711f403c45062e56503e3c65bce47.tar.xz
wireguard-windows-c98a987e21e711f403c45062e56503e3c65bce47.zip
main: cleanup info printing
-rw-r--r--main.go10
1 files changed, 6 insertions, 4 deletions
diff --git a/main.go b/main.go
index e4c569cb..348f1df4 100644
--- a/main.go
+++ b/main.go
@@ -39,13 +39,16 @@ func fatal(v ...interface{}) {
os.Exit(1)
}
+func info(title string, format string, v ...interface{}) {
+ windows.MessageBox(0, windows.StringToUTF16Ptr(fmt.Sprintf(format, v...)), windows.StringToUTF16Ptr(title), windows.MB_ICONINFORMATION)
+}
+
func usage() {
builder := strings.Builder{}
for _, flag := range flags {
builder.WriteString(fmt.Sprintf(" %s\n", flag))
}
- msg := fmt.Sprintf("Usage: %s [\n%s]", os.Args[0], builder.String())
- windows.MessageBox(0, windows.StringToUTF16Ptr(msg), windows.StringToUTF16Ptr("Command Line Options"), windows.MB_ICONINFORMATION)
+ info("Command Line Options", "Usage: %s [\n%s]", os.Args[0], builder.String())
os.Exit(1)
}
@@ -232,8 +235,7 @@ func main() {
if rebootRequired {
rebootString = " A reboot is required."
}
- windows.MessageBox(0, windows.StringToUTF16Ptr(fmt.Sprintf("Deleted %s%s.%s",
- interfaceString, errorString, rebootString)), windows.StringToUTF16Ptr("Wintun Cleanup"), windows.MB_ICONINFORMATION)
+ info("Wintun Cleanup", "Deleted %s%s.%s", interfaceString, errorString, rebootString)
return
default:
usage()