From 111302f9e37c34fc3e21dc149755e9fb4212763d Mon Sep 17 00:00:00 2001 From: Alessandro Ros Date: Tue, 19 May 2026 11:48:05 +0200 Subject: [PATCH] use file name suffix for OS-specific code wherever possible (#5787) --- internal/externalcmd/{cmd_unix.go => cmd_os.go} | 0 internal/externalcmd/{cmd_win.go => cmd_os_windows.go} | 2 -- internal/externalcmd/cmd_test.go | 2 -- ...ion_syslog_disabled.go => destination_syslog_darwin.go} | 2 -- internal/logger/destination_syslog_windows.go | 7 +++++++ internal/rlimit/{rlimit_unix.go => rlimit.go} | 0 internal/rlimit/{rlimit_win.go => rlimit_windows.go} | 2 -- .../rpicamera/{camera_arm32_.go => camera_linux_arm.go} | 2 -- .../rpicamera/{camera_arm64_.go => camera_linux_arm64.go} | 2 -- 9 files changed, 7 insertions(+), 12 deletions(-) rename internal/externalcmd/{cmd_unix.go => cmd_os.go} (100%) rename internal/externalcmd/{cmd_win.go => cmd_os_windows.go} (99%) rename internal/logger/{destination_syslog_disabled.go => destination_syslog_darwin.go} (84%) create mode 100644 internal/logger/destination_syslog_windows.go rename internal/rlimit/{rlimit_unix.go => rlimit.go} (100%) rename internal/rlimit/{rlimit_win.go => rlimit_windows.go} (71%) rename internal/staticsources/rpicamera/{camera_arm32_.go => camera_linux_arm.go} (78%) rename internal/staticsources/rpicamera/{camera_arm64_.go => camera_linux_arm64.go} (76%) diff --git a/internal/externalcmd/cmd_unix.go b/internal/externalcmd/cmd_os.go similarity index 100% rename from internal/externalcmd/cmd_unix.go rename to internal/externalcmd/cmd_os.go diff --git a/internal/externalcmd/cmd_win.go b/internal/externalcmd/cmd_os_windows.go similarity index 99% rename from internal/externalcmd/cmd_win.go rename to internal/externalcmd/cmd_os_windows.go index 98bc7e33..08a79df0 100644 --- a/internal/externalcmd/cmd_win.go +++ b/internal/externalcmd/cmd_os_windows.go @@ -1,5 +1,3 @@ -//go:build windows - package externalcmd import ( diff --git a/internal/externalcmd/cmd_test.go b/internal/externalcmd/cmd_test.go index ee6ac219..eb0d13a1 100644 --- a/internal/externalcmd/cmd_test.go +++ b/internal/externalcmd/cmd_test.go @@ -1,5 +1,3 @@ -//go:build !windows - package externalcmd import ( diff --git a/internal/logger/destination_syslog_disabled.go b/internal/logger/destination_syslog_darwin.go similarity index 84% rename from internal/logger/destination_syslog_disabled.go rename to internal/logger/destination_syslog_darwin.go index d0788b24..3dd4d863 100644 --- a/internal/logger/destination_syslog_disabled.go +++ b/internal/logger/destination_syslog_darwin.go @@ -1,5 +1,3 @@ -//go:build darwin || windows - package logger import "fmt" diff --git a/internal/logger/destination_syslog_windows.go b/internal/logger/destination_syslog_windows.go new file mode 100644 index 00000000..3dd4d863 --- /dev/null +++ b/internal/logger/destination_syslog_windows.go @@ -0,0 +1,7 @@ +package logger + +import "fmt" + +func newDestinationSyslog(_ string) (destination, error) { + return nil, fmt.Errorf("syslog is not available on macOS and Windows") +} diff --git a/internal/rlimit/rlimit_unix.go b/internal/rlimit/rlimit.go similarity index 100% rename from internal/rlimit/rlimit_unix.go rename to internal/rlimit/rlimit.go diff --git a/internal/rlimit/rlimit_win.go b/internal/rlimit/rlimit_windows.go similarity index 71% rename from internal/rlimit/rlimit_win.go rename to internal/rlimit/rlimit_windows.go index a3510e6c..d353f028 100644 --- a/internal/rlimit/rlimit_win.go +++ b/internal/rlimit/rlimit_windows.go @@ -1,5 +1,3 @@ -//go:build windows - package rlimit func Raise() error { diff --git a/internal/staticsources/rpicamera/camera_arm32_.go b/internal/staticsources/rpicamera/camera_linux_arm.go similarity index 78% rename from internal/staticsources/rpicamera/camera_arm32_.go rename to internal/staticsources/rpicamera/camera_linux_arm.go index 241217b4..57b75300 100644 --- a/internal/staticsources/rpicamera/camera_arm32_.go +++ b/internal/staticsources/rpicamera/camera_linux_arm.go @@ -1,5 +1,3 @@ -//go:build linux && arm - package rpicamera import ( diff --git a/internal/staticsources/rpicamera/camera_arm64_.go b/internal/staticsources/rpicamera/camera_linux_arm64.go similarity index 76% rename from internal/staticsources/rpicamera/camera_arm64_.go rename to internal/staticsources/rpicamera/camera_linux_arm64.go index 0d195682..f481567e 100644 --- a/internal/staticsources/rpicamera/camera_arm64_.go +++ b/internal/staticsources/rpicamera/camera_linux_arm64.go @@ -1,5 +1,3 @@ -//go:build linux && arm64 - package rpicamera import (