From d0a4344a6e77c113d82c5ff8b3a9c4161b013591 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 13 Jun 2019 11:05:52 +0200 Subject: main: cleanup info printing Signed-off-by: Jason A. Donenfeld --- main.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'main.go') 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() -- cgit v1.2.3-59-g8ed1b