global: correct names and patterns for go lint

10 files changed, 66 insertions, 70 deletions

diff --git a/conf/config.go b/conf/config.go
index b26dd09d..5b3496b6 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -67,9 +67,8 @@ func (r *IPCidr) String() string {
 func (r *IPCidr) Bits() uint8 {
 	if r.IP.To4() != nil {
 		return 32
-	} else {
-		return 128
 	}
+	return 128
 }
 
 func (r *IPCidr) IPNet() net.IPNet {
diff --git a/service/errors.go b/service/errors.go
index e71f0d71..a2cb7bc5 100644
--- a/service/errors.go
+++ b/service/errors.go
@@ -89,9 +89,8 @@ func combineErrors(err error, serviceError Error) error {
 	if serviceError != ErrorSuccess {
 		if err != nil {
 			return fmt.Errorf("%v: %v", serviceError, err)
-		} else {
-			return serviceError
 		}
+		return serviceError
 	}
 	return err
-}
\ No newline at end of file
+}
diff --git a/service/firewall/helpers.go b/service/firewall/helpers.go
index c9968660..e340b802 100644
--- a/service/firewall/helpers.go
+++ b/service/firewall/helpers.go
@@ -67,9 +67,8 @@ func wrapErr(err error) error {
 	_, file, line, ok := runtime.Caller(1)
 	if !ok {
 		return fmt.Errorf("Firewall error at unknown location: %v", err)
-	} else {
-		return fmt.Errorf("Firewall error at %s:%d: %v", file, line, err)
 	}
+	return fmt.Errorf("Firewall error at %s:%d: %v", file, line, err)
 }
 
 func getCurrentProcessSecurityDescriptor() (*wtFwpByteBlob, error) {
@@ -86,7 +85,7 @@ func getCurrentProcessSecurityDescriptor() (*wtFwpByteBlob, error) {
 	return blob, nil
 }
 
-func getCurrentProcessAppId() (*wtFwpByteBlob, error) {
+func getCurrentProcessAppID() (*wtFwpByteBlob, error) {
 	currentFile, err := os.Executable()
 	if err != nil {
 		return nil, wrapErr(err)
@@ -97,10 +96,10 @@ func getCurrentProcessAppId() (*wtFwpByteBlob, error) {
 		return nil, wrapErr(err)
 	}
 
-	var appId *wtFwpByteBlob
-	err = fwpmGetAppIdFromFileName0(curFilePtr, unsafe.Pointer(&appId))
+	var appID *wtFwpByteBlob
+	err = fwpmGetAppIdFromFileName0(curFilePtr, unsafe.Pointer(&appID))
 	if err != nil {
 		return nil, wrapErr(err)
 	}
-	return appId, nil
+	return appID, nil
 }
diff --git a/service/firewall/rules.go b/service/firewall/rules.go
index c2ba4b28..59df4840 100644
--- a/service/firewall/rules.go
+++ b/service/firewall/rules.go
@@ -49,7 +49,7 @@ func permitTunInterface(session uintptr, baseObjects *baseObjects, weight uint8,
 		},
 	}
 
-	filterId := uint64(0)
+	filterID := uint64(0)
 
 	//
 	// #1 Permit outbound IPv4 traffic.
@@ -63,7 +63,7 @@ func permitTunInterface(session uintptr, baseObjects *baseObjects, weight uint8,
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_CONNECT_V4
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -81,7 +81,7 @@ func permitTunInterface(session uintptr, baseObjects *baseObjects, weight uint8,
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -99,7 +99,7 @@ func permitTunInterface(session uintptr, baseObjects *baseObjects, weight uint8,
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_CONNECT_V6
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -117,7 +117,7 @@ func permitTunInterface(session uintptr, baseObjects *baseObjects, weight uint8,
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V6
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -132,18 +132,18 @@ func permitWireGuardService(session uintptr, baseObjects *baseObjects, weight ui
 	//
 	// First condition is the exe path of the current process.
 	//
-	appId, err := getCurrentProcessAppId()
+	appID, err := getCurrentProcessAppID()
 	if err != nil {
 		return wrapErr(err)
 	}
-	defer fwpmFreeMemory0(unsafe.Pointer(&appId))
+	defer fwpmFreeMemory0(unsafe.Pointer(&appID))
 
 	conditions[0] = wtFwpmFilterCondition0{
 		fieldKey:  cFWPM_CONDITION_ALE_APP_ID,
 		matchType: cFWP_MATCH_EQUAL,
 		conditionValue: wtFwpConditionValue0{
 			_type: cFWP_BYTE_BLOB_TYPE,
-			value: uintptr(unsafe.Pointer(appId)),
+			value: uintptr(unsafe.Pointer(appID)),
 		},
 	}
 
@@ -181,7 +181,7 @@ func permitWireGuardService(session uintptr, baseObjects *baseObjects, weight ui
 		},
 	}
 
-	filterId := uint64(0)
+	filterID := uint64(0)
 
 	//
 	// #1 Permit outbound IPv4 traffic.
@@ -195,7 +195,7 @@ func permitWireGuardService(session uintptr, baseObjects *baseObjects, weight ui
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_CONNECT_V4
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -213,7 +213,7 @@ func permitWireGuardService(session uintptr, baseObjects *baseObjects, weight ui
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -231,7 +231,7 @@ func permitWireGuardService(session uintptr, baseObjects *baseObjects, weight ui
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_CONNECT_V6
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -249,7 +249,7 @@ func permitWireGuardService(session uintptr, baseObjects *baseObjects, weight ui
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V6
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -279,7 +279,7 @@ func permitLoopback(session uintptr, baseObjects *baseObjects, weight uint8) err
 		},
 	}
 
-	filterId := uint64(0)
+	filterID := uint64(0)
 
 	//
 	// #1 Permit outbound IPv4 on loopback.
@@ -293,7 +293,7 @@ func permitLoopback(session uintptr, baseObjects *baseObjects, weight uint8) err
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_CONNECT_V4
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -311,7 +311,7 @@ func permitLoopback(session uintptr, baseObjects *baseObjects, weight uint8) err
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -329,7 +329,7 @@ func permitLoopback(session uintptr, baseObjects *baseObjects, weight uint8) err
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_CONNECT_V6
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -347,7 +347,7 @@ func permitLoopback(session uintptr, baseObjects *baseObjects, weight uint8) err
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V6
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -401,9 +401,9 @@ func permitDHCPIPv4(session uintptr, baseObjects *baseObjects, weight uint8) err
 			},
 		}
 
-		filterId := uint64(0)
+		filterID := uint64(0)
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -448,9 +448,9 @@ func permitDHCPIPv4(session uintptr, baseObjects *baseObjects, weight uint8) err
 			},
 		}
 
-		filterId := uint64(0)
+		filterID := uint64(0)
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -515,9 +515,9 @@ func permitDHCPIPv6(session uintptr, baseObjects *baseObjects, weight uint8) err
 			},
 		}
 
-		filterId := uint64(0)
+		filterID := uint64(0)
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -572,9 +572,9 @@ func permitDHCPIPv6(session uintptr, baseObjects *baseObjects, weight uint8) err
 			},
 		}
 
-		filterId := uint64(0)
+		filterID := uint64(0)
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -807,7 +807,7 @@ func permitNdp(session uintptr, baseObjects *baseObjects, weight uint8) error {
 		},
 	}
 
-	filterId := uint64(0)
+	filterID := uint64(0)
 
 	for _, definition := range defs {
 		filter.displayData = *definition.displayData
@@ -815,7 +815,7 @@ func permitNdp(session uintptr, baseObjects *baseObjects, weight uint8) error {
 		filter.numFilterConditions = uint32(len(definition.conditions))
 		filter.filterCondition = (*wtFwpmFilterCondition0)(unsafe.Pointer(&definition.conditions[0]))
 
-		err := fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err := fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -861,7 +861,7 @@ func permitHyperV(session uintptr, baseObjects *baseObjects, weight uint8) error
 		},
 	}
 
-	filterId := uint64(0)
+	filterID := uint64(0)
 
 	//
 	// #1 Outbound.
@@ -875,7 +875,7 @@ func permitHyperV(session uintptr, baseObjects *baseObjects, weight uint8) error
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_OUTBOUND_MAC_FRAME_NATIVE
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -893,7 +893,7 @@ func permitHyperV(session uintptr, baseObjects *baseObjects, weight uint8) error
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_INBOUND_MAC_FRAME_NATIVE
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -913,7 +913,7 @@ func blockAll(session uintptr, baseObjects *baseObjects, weight uint8) error {
 		},
 	}
 
-	filterId := uint64(0)
+	filterID := uint64(0)
 
 	//
 	// #1 Block outbound traffic on IPv4.
@@ -927,7 +927,7 @@ func blockAll(session uintptr, baseObjects *baseObjects, weight uint8) error {
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_CONNECT_V4
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -945,7 +945,7 @@ func blockAll(session uintptr, baseObjects *baseObjects, weight uint8) error {
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -963,7 +963,7 @@ func blockAll(session uintptr, baseObjects *baseObjects, weight uint8) error {
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_CONNECT_V6
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -981,7 +981,7 @@ func blockAll(session uintptr, baseObjects *baseObjects, weight uint8) error {
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V6
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -1035,7 +1035,7 @@ func blockDNS(except []net.IP, session uintptr, baseObjects *baseObjects, weight
 		},
 	}
 
-	filterId := uint64(0)
+	filterID := uint64(0)
 
 	//
 	// #1 Block IPv4 outbound DNS.
@@ -1049,7 +1049,7 @@ func blockDNS(except []net.IP, session uintptr, baseObjects *baseObjects, weight
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_CONNECT_V4
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -1067,7 +1067,7 @@ func blockDNS(except []net.IP, session uintptr, baseObjects *baseObjects, weight
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -1085,7 +1085,7 @@ func blockDNS(except []net.IP, session uintptr, baseObjects *baseObjects, weight
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_CONNECT_V6
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -1103,7 +1103,7 @@ func blockDNS(except []net.IP, session uintptr, baseObjects *baseObjects, weight
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V6
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -1157,7 +1157,7 @@ func blockDNS(except []net.IP, session uintptr, baseObjects *baseObjects, weight
 		},
 	}
 
-	filterId = uint64(0)
+	filterID = uint64(0)
 
 	//
 	// #5 Allow IPv4 outbound DNS.
@@ -1171,7 +1171,7 @@ func blockDNS(except []net.IP, session uintptr, baseObjects *baseObjects, weight
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_CONNECT_V4
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -1189,7 +1189,7 @@ func blockDNS(except []net.IP, session uintptr, baseObjects *baseObjects, weight
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -1210,7 +1210,7 @@ func blockDNS(except []net.IP, session uintptr, baseObjects *baseObjects, weight
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_CONNECT_V6
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
@@ -1228,7 +1228,7 @@ func blockDNS(except []net.IP, session uintptr, baseObjects *baseObjects, weight
 		filter.displayData = *displayData
 		filter.layerKey = cFWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V6
 
-		err = fwpmFilterAdd0(session, &filter, 0, &filterId)
+		err = fwpmFilterAdd0(session, &filter, 0, &filterID)
 		if err != nil {
 			return wrapErr(err)
 		}
diff --git a/service/firewall/syscall_windows.go b/service/firewall/syscall_windows.go
index 27eb462b..5ec41b0b 100644
--- a/service/firewall/syscall_windows.go
+++ b/service/firewall/syscall_windows.go
@@ -15,7 +15,7 @@ package firewall
 //sys	fwpmSubLayerAdd0(engineHandle uintptr, subLayer *wtFwpmSublayer0, sd uintptr) (err error) [failretval!=0] = fwpuclnt.FwpmSubLayerAdd0
 
 // https://docs.microsoft.com/en-us/windows/desktop/api/fwpmu/nf-fwpmu-fwpmgetappidfromfilename0
-//sys	fwpmGetAppIdFromFileName0(fileName *uint16, appId unsafe.Pointer) (err error) [failretval!=0] = fwpuclnt.FwpmGetAppIdFromFileName0
+//sys	fwpmGetAppIdFromFileName0(fileName *uint16, appID unsafe.Pointer) (err error) [failretval!=0] = fwpuclnt.FwpmGetAppIdFromFileName0
 
 // https://docs.microsoft.com/en-us/windows/desktop/api/fwpmu/nf-fwpmu-fwpmfreememory0
 //sys	fwpmFreeMemory0(p unsafe.Pointer) = fwpuclnt.FwpmFreeMemory0
diff --git a/service/firewall/types_windows_386.go b/service/firewall/types_windows_386.go
index 765e5aef..00d7ba8f 100644
--- a/service/firewall/types_windows_386.go
+++ b/service/firewall/types_windows_386.go
@@ -30,7 +30,7 @@ const (
 	wtFwpmFilter0_action_Offset              = 88
 	wtFwpmFilter0_providerContextKey_Offset  = 112
 	wtFwpmFilter0_reserved_Offset            = 128
-	wtFwpmFilter0_filterId_Offset            = 136
+	wtFwpmFilter0_filterID_Offset            = 136
 	wtFwpmFilter0_effectiveWeight_Offset     = 144
 
 	wtFwpmFilterCondition0_Size                  = 28
@@ -83,6 +83,6 @@ type wtFwpmFilter0 struct {
 	providerContextKey  windows.GUID  // Windows type: GUID
 	reserved            *windows.GUID // Windows type: *GUID
 	offset2             [4]byte       // Layout correction field
-	filterId            uint64
+	filterID            uint64
 	effectiveWeight     wtFwpValue0
 }
diff --git a/service/firewall/types_windows_amd64.go b/service/firewall/types_windows_amd64.go
index 0f04e5d3..f0aa557c 100644
--- a/service/firewall/types_windows_amd64.go
+++ b/service/firewall/types_windows_amd64.go
@@ -30,7 +30,7 @@ const (
 	wtFwpmFilter0_action_Offset              = 128
 	wtFwpmFilter0_providerContextKey_Offset  = 152
 	wtFwpmFilter0_reserved_Offset            = 168
-	wtFwpmFilter0_filterId_Offset            = 176
+	wtFwpmFilter0_filterID_Offset            = 176
 	wtFwpmFilter0_effectiveWeight_Offset     = 184
 
 	wtFwpmFilterCondition0_Size                  = 40
@@ -80,6 +80,6 @@ type wtFwpmFilter0 struct {
 	offset1             [4]byte       // Layout correction field
 	providerContextKey  windows.GUID  // Windows type: GUID
 	reserved            *windows.GUID // Windows type: *GUID
-	filterId            uint64
+	filterID            uint64
 	effectiveWeight     wtFwpValue0
 }
diff --git a/service/firewall/types_windows_test.go b/service/firewall/types_windows_test.go
index 5015672d..97cb032c 100644
--- a/service/firewall/types_windows_test.go
+++ b/service/firewall/types_windows_test.go
@@ -346,11 +346,11 @@ func TestWtFwpmFilter0Offsets(t *testing.T) {
 		return
 	}
 
-	offset = uintptr(unsafe.Pointer(&s.filterId)) - sp
+	offset = uintptr(unsafe.Pointer(&s.filterID)) - sp
 
-	if offset != wtFwpmFilter0_filterId_Offset {
-		t.Errorf("wtFwpmFilter0.filterId offset is %d although %d is expected", offset,
-			wtFwpmFilter0_filterId_Offset)
+	if offset != wtFwpmFilter0_filterID_Offset {
+		t.Errorf("wtFwpmFilter0.filterID offset is %d although %d is expected", offset,
+			wtFwpmFilter0_filterID_Offset)
 		return
 	}
 
diff --git a/service/firewall/zsyscall_windows.go b/service/firewall/zsyscall_windows.go
index f4a8a054..15e72703 100644
--- a/service/firewall/zsyscall_windows.go
+++ b/service/firewall/zsyscall_windows.go
@@ -90,8 +90,8 @@ func fwpmSubLayerAdd0(engineHandle uintptr, subLayer *wtFwpmSublayer0, sd uintpt
 	return
 }
 
-func fwpmGetAppIdFromFileName0(fileName *uint16, appId unsafe.Pointer) (err error) {
-	r1, _, e1 := syscall.Syscall(procFwpmGetAppIdFromFileName0.Addr(), 2, uintptr(unsafe.Pointer(fileName)), uintptr(appId), 0)
+func fwpmGetAppIdFromFileName0(fileName *uint16, appID unsafe.Pointer) (err error) {
+	r1, _, e1 := syscall.Syscall(procFwpmGetAppIdFromFileName0.Addr(), 2, uintptr(unsafe.Pointer(fileName)), uintptr(appID), 0)
 	if r1 != 0 {
 		if e1 != 0 {
 			err = errnoErr(e1)
diff --git a/ui/syntax/syntaxedit.go b/ui/syntax/syntaxedit.go
index 62b4310b..1f0fb692 100644
--- a/ui/syntax/syntaxedit.go
+++ b/ui/syntax/syntaxedit.go
@@ -120,9 +120,8 @@ func NewSyntaxEdit(parent walk.Container) (*SyntaxEdit, error) {
 		func(v interface{}) error {
 			if s, ok := v.(string); ok {
 				return se.SetText(s)
-			} else {
-				return se.SetText("")
 			}
+			return se.SetText("")
 		},
 		se.textChangedPublisher.Event()))