From 08117299c13ed0224c7924f27b8e64df35fb20bd Mon Sep 17 00:00:00 2001 From: ProtoTess <32490978+0x524a@users.noreply.github.com> Date: Fri, 16 Jan 2026 06:12:27 +0000 Subject: [PATCH] Fix remaining nlreturn and wrapcheck linting errors --- cmd/onvif-diagnostics/main.go | 12 ++++++------ device_security.go | 1 + ptz.go | 2 ++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cmd/onvif-diagnostics/main.go b/cmd/onvif-diagnostics/main.go index 3f2ff8d..c1c225f 100644 --- a/cmd/onvif-diagnostics/main.go +++ b/cmd/onvif-diagnostics/main.go @@ -998,12 +998,12 @@ func runComprehensiveCapture(ctx context.Context, client *onvif.Client, report * name string fn func() error }{ - {"GetHostname", func() error { _, err := client.GetHostname(ctx); return err }}, //nolint:nlreturn - {"GetDNS", func() error { _, err := client.GetDNS(ctx); return err }}, //nolint:nlreturn - {"GetNTP", func() error { _, err := client.GetNTP(ctx); return err }}, //nolint:nlreturn - {"GetNetworkInterfaces", func() error { _, err := client.GetNetworkInterfaces(ctx); return err }}, //nolint:nlreturn - {"GetNetworkProtocols", func() error { _, err := client.GetNetworkProtocols(ctx); return err }}, //nolint:nlreturn - {"GetNetworkDefaultGateway", func() error { _, err := client.GetNetworkDefaultGateway(ctx); return err }}, //nolint:nlreturn + {"GetHostname", func() error { _, err := client.GetHostname(ctx); return fmt.Errorf("GetHostname: %w", err) }}, + {"GetDNS", func() error { _, err := client.GetDNS(ctx); return fmt.Errorf("GetDNS: %w", err) }}, + {"GetNTP", func() error { _, err := client.GetNTP(ctx); return fmt.Errorf("GetNTP: %w", err) }}, + {"GetNetworkInterfaces", func() error { _, err := client.GetNetworkInterfaces(ctx); return fmt.Errorf("GetNetworkInterfaces: %w", err) }}, + {"GetNetworkProtocols", func() error { _, err := client.GetNetworkProtocols(ctx); return fmt.Errorf("GetNetworkProtocols: %w", err) }}, + {"GetNetworkDefaultGateway", func() error { _, err := client.GetNetworkDefaultGateway(ctx); return fmt.Errorf("GetNetworkDefaultGateway: %w", err) }}, {"GetScopes", func() error { _, err := client.GetScopes(ctx); return err }}, {"GetUsers", func() error { _, err := client.GetUsers(ctx); return err }}, {"GetDiscoveryMode", func() error { _, err := client.GetDiscoveryMode(ctx); return err }}, diff --git a/device_security.go b/device_security.go index 8e61fb8..118131a 100644 --- a/device_security.go +++ b/device_security.go @@ -58,6 +58,7 @@ func buildIPAddressFilterRequest(filter *IPAddressFilter) ipAddressFilterRequest // newSOAPClient creates a SOAP client with the current client credentials. func (c *Client) newSOAPClient() *soap.Client { username, password := c.GetCredentials() + return soap.NewClient(c.httpClient, username, password) } diff --git a/ptz.go b/ptz.go index 4d9e099..763d4b9 100644 --- a/ptz.go +++ b/ptz.go @@ -48,6 +48,7 @@ func convertToPTZVectorXML(v *PTZVector) *ptzVectorXML { if v.Zoom != nil { result.Zoom = &ptzZoomXML{X: v.Zoom.X, Space: v.Zoom.Space} } + return result } @@ -63,6 +64,7 @@ func convertToPTZSpeedXML(s *PTZSpeed) *ptzSpeedXML { if s.Zoom != nil { result.Zoom = &ptzZoomXML{X: s.Zoom.X, Space: s.Zoom.Space} } + return result }