chore: use go fix to cleanup old +build buildtag

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-12-29 14:22:15 +08:00
parent cfe7ac9956
commit 6b7e237fc7
160 changed files with 0 additions and 160 deletions
--- a/archive/compression/compression_fuzzer.go
+++ b/archive/compression/compression_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz

 /*
   Copyright The containerd Authors.
--- a/content/local/content_local_fuzzer.go
+++ b/content/local/content_local_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz

 /*
   Copyright The containerd Authors.
--- a/content/local/store_bsd.go
+++ b/content/local/store_bsd.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd || netbsd
-// +build darwin freebsd netbsd

 /*
   Copyright The containerd Authors.
--- a/content/local/store_openbsd.go
+++ b/content/local/store_openbsd.go
@@ -1,5 +1,4 @@
 //go:build openbsd
-// +build openbsd

 /*
   Copyright The containerd Authors.
--- a/content/local/store_unix.go
+++ b/content/local/store_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || solaris
-// +build linux solaris

 /*
   Copyright The containerd Authors.
--- a/contrib/apparmor/apparmor.go
+++ b/contrib/apparmor/apparmor.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/contrib/apparmor/apparmor_fuzzer.go
+++ b/contrib/apparmor/apparmor_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz

 // Copyright 2022 ADA Logics Ltd
 //
--- a/contrib/apparmor/apparmor_test.go
+++ b/contrib/apparmor/apparmor_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/contrib/apparmor/apparmor_unsupported.go
+++ b/contrib/apparmor/apparmor_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/contrib/apparmor/template.go
+++ b/contrib/apparmor/template.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The docker Authors.
--- a/contrib/apparmor/template_test.go
+++ b/contrib/apparmor/template_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 package apparmor

--- a/contrib/fuzz/archive_fuzzer.go
+++ b/contrib/fuzz/archive_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz

 /*
   Copyright The containerd Authors.
--- a/contrib/fuzz/containerd_import_fuzzer.go
+++ b/contrib/fuzz/containerd_import_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz

 /*
   Copyright The containerd Authors.
--- a/contrib/fuzz/content_fuzzer.go
+++ b/contrib/fuzz/content_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz

 /*
   Copyright The containerd Authors.
--- a/contrib/fuzz/cri_fuzzer.go
+++ b/contrib/fuzz/cri_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz

 /*
   Copyright The containerd Authors.
--- a/contrib/fuzz/cri_sbserver_fuzzer.go
+++ b/contrib/fuzz/cri_sbserver_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz

 /*
   Copyright The containerd Authors.
--- a/contrib/fuzz/cri_server_fuzzer.go
+++ b/contrib/fuzz/cri_server_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz

 /*
   Copyright The containerd Authors.
--- a/contrib/fuzz/daemon.go
+++ b/contrib/fuzz/daemon.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz

 /*
   Copyright The containerd Authors.
--- a/contrib/fuzz/metadata_fuzzer.go
+++ b/contrib/fuzz/metadata_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz

 /*
   Copyright The containerd Authors.
--- a/contrib/seccomp/seccomp_default.go
+++ b/contrib/seccomp/seccomp_default.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/contrib/seccomp/seccomp_default_unsupported.go
+++ b/contrib/seccomp/seccomp_default_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/diff/apply/apply_other.go
+++ b/diff/apply/apply_other.go
@@ -1,5 +1,4 @@
 //go:build !linux && !darwin
-// +build !linux,!darwin

 /*
   Copyright The containerd Authors.
--- a/integration/client/client_unix.go
+++ b/integration/client/client_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/integration/client/client_unix_test.go
+++ b/integration/client/client_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/integration/client/container_checkpoint_test.go
+++ b/integration/client/container_checkpoint_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/integration/client/container_fuzzer.go
+++ b/integration/client/container_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz

 /*
   Copyright The containerd Authors.
--- a/integration/client/helpers_unix.go
+++ b/integration/client/helpers_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/integration/client/helpers_unix_test.go
+++ b/integration/client/helpers_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/integration/client/task_opts_unix_test.go
+++ b/integration/client/task_opts_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/integration/remote/util/util_unix.go
+++ b/integration/remote/util/util_unix.go
@@ -1,5 +1,4 @@
 //go:build freebsd || linux || darwin
-// +build freebsd linux darwin

 /*
   Copyright The containerd Authors.
--- a/integration/remote/util/util_unsupported.go
+++ b/integration/remote/util/util_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !freebsd && !linux && !windows && !darwin
-// +build !freebsd,!linux,!windows,!darwin

 /*
   Copyright The containerd Authors.
--- a/integration/windows_device_test.go
+++ b/integration/windows_device_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/cgroups.go
+++ b/metrics/cgroups/cgroups.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/common/type.go
+++ b/metrics/cgroups/common/type.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/metrics_test.go
+++ b/metrics/cgroups/metrics_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v1/blkio.go
+++ b/metrics/cgroups/v1/blkio.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v1/cgroups.go
+++ b/metrics/cgroups/v1/cgroups.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v1/cpu.go
+++ b/metrics/cgroups/v1/cpu.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v1/hugetlb.go
+++ b/metrics/cgroups/v1/hugetlb.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v1/memory.go
+++ b/metrics/cgroups/v1/memory.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v1/metric.go
+++ b/metrics/cgroups/v1/metric.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v1/metrics.go
+++ b/metrics/cgroups/v1/metrics.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v1/oom.go
+++ b/metrics/cgroups/v1/oom.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v1/pids.go
+++ b/metrics/cgroups/v1/pids.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v2/cgroups.go
+++ b/metrics/cgroups/v2/cgroups.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v2/cpu.go
+++ b/metrics/cgroups/v2/cpu.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v2/io.go
+++ b/metrics/cgroups/v2/io.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v2/memory.go
+++ b/metrics/cgroups/v2/memory.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v2/metric.go
+++ b/metrics/cgroups/v2/metric.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v2/metrics.go
+++ b/metrics/cgroups/v2/metrics.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/cgroups/v2/pids.go
+++ b/metrics/cgroups/v2/pids.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/types/v1/types.go
+++ b/metrics/types/v1/types.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/metrics/types/v2/types.go
+++ b/metrics/types/v2/types.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/apparmor/apparmor_unsupported.go
+++ b/pkg/apparmor/apparmor_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/blockio_linux.go
+++ b/pkg/cri/sbserver/blockio_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/blockio_stub_linux.go
+++ b/pkg/cri/sbserver/blockio_stub_linux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/container_create_other.go
+++ b/pkg/cri/sbserver/container_create_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/container_create_other_test.go
+++ b/pkg/cri/sbserver/container_create_other_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/container_stats_list_other.go
+++ b/pkg/cri/sbserver/container_stats_list_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/container_update_resources.go
+++ b/pkg/cri/sbserver/container_update_resources.go
@@ -1,5 +1,4 @@
 //go:build !darwin && !freebsd
-// +build !darwin,!freebsd

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/container_update_resources_other.go
+++ b/pkg/cri/sbserver/container_update_resources_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/fuzz.go
+++ b/pkg/cri/sbserver/fuzz.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/helpers_other.go
+++ b/pkg/cri/sbserver/helpers_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/podsandbox/helpers_other.go
+++ b/pkg/cri/sbserver/podsandbox/helpers_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/podsandbox/sandbox_run_other.go
+++ b/pkg/cri/sbserver/podsandbox/sandbox_run_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/podsandbox/sandbox_run_other_test.go
+++ b/pkg/cri/sbserver/podsandbox/sandbox_run_other_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/rdt_linux.go
+++ b/pkg/cri/sbserver/rdt_linux.go
@@ -1,5 +1,4 @@
 //go:build !no_rdt
-// +build !no_rdt

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/rdt_stub_linux.go
+++ b/pkg/cri/sbserver/rdt_stub_linux.go
@@ -1,5 +1,4 @@
 //go:build no_rdt
-// +build no_rdt

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/sandbox_portforward_other.go
+++ b/pkg/cri/sbserver/sandbox_portforward_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/sandbox_run_other.go
+++ b/pkg/cri/sbserver/sandbox_run_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/sandbox_stats_other.go
+++ b/pkg/cri/sbserver/sandbox_stats_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/sbserver/service_other.go
+++ b/pkg/cri/sbserver/service_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/server/bandwidth/unsupported.go
+++ b/pkg/cri/server/bandwidth/unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/server/nri-api.go
+++ b/pkg/cri/server/nri-api.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/server/nri-api_other.go
+++ b/pkg/cri/server/nri-api_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/cri/server/nri-api_windows.go
+++ b/pkg/cri/server/nri-api_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows

 /*
   Copyright The containerd Authors.
--- a/pkg/dialer/dialer_unix.go
+++ b/pkg/dialer/dialer_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/netns/netns_other.go
+++ b/pkg/netns/netns_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux

 /*
   Copyright The containerd Authors.
--- a/pkg/nri/container_linux.go
+++ b/pkg/nri/container_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/nri/container_other.go
+++ b/pkg/nri/container_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/nri/sandbox_linux.go
+++ b/pkg/nri/sandbox_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/nri/sandbox_other.go
+++ b/pkg/nri/sandbox_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/oom/oom.go
+++ b/pkg/oom/oom.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/oom/v1/v1.go
+++ b/pkg/oom/v1/v1.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/oom/v2/v2.go
+++ b/pkg/oom/v2/v2.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/process/deleted_state.go
+++ b/pkg/process/deleted_state.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/process/exec.go
+++ b/pkg/process/exec.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/process/exec_state.go
+++ b/pkg/process/exec_state.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/process/init.go
+++ b/pkg/process/init.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/process/init_state.go
+++ b/pkg/process/init_state.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/process/io.go
+++ b/pkg/process/io.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/process/io_test.go
+++ b/pkg/process/io_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux

 /*
   Copyright The containerd Authors.
--- a/pkg/process/utils.go
+++ b/pkg/process/utils.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/seccomp/seccomp_unsupported.go
+++ b/pkg/seccomp/seccomp_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/seed/seed_other.go
+++ b/pkg/seed/seed_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/pkg/testutil/helpers_unix.go
+++ b/pkg/testutil/helpers_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/pkg/testutil/mount_other.go
+++ b/pkg/testutil/mount_other.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows

 /*
   Copyright The containerd Authors.
--- a/pkg/userns/userns_unsupported.go
+++ b/pkg/userns/userns_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/platforms/cpuinfo_other.go
+++ b/platforms/cpuinfo_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux

 /*
   Copyright The containerd Authors.
--- a/remotes/docker/config/config_unix.go
+++ b/remotes/docker/config/config_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows

 /*
   Copyright The containerd Authors.
--- a/Show More
+++ b/Show More