From 8f5df19b353e02ffba842fd1b15ccf93da7ee3b4 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Mon, 7 Jul 2025 19:54:48 +0200
Subject: Fix a bunch of staticcheck errors

Tool-assisted.
---
 tests/reverse/correctness_test.go     | 9 ++++-----
 tests/reverse/ctlsock_test.go         | 6 +++---
 tests/reverse/force_owner_test.go     | 3 +--
 tests/reverse/one_file_system_test.go | 2 +-
 tests/reverse/xattr_test.go           | 4 ++--
 5 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'tests/reverse')

diff --git a/tests/reverse/correctness_test.go b/tests/reverse/correctness_test.go
index e4684df..4028ac3 100644
--- a/tests/reverse/correctness_test.go
+++ b/tests/reverse/correctness_test.go
@@ -3,7 +3,6 @@ package reverse_test
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -72,7 +71,7 @@ func TestSymlinkDentrySize(t *testing.T) {
 	}
 	symlink := "a_symlink"
 
-	mnt, err := ioutil.TempDir(test_helpers.TmpDir, "reverse_mnt_")
+	mnt, err := os.MkdirTemp(test_helpers.TmpDir, "reverse_mnt_")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -111,7 +110,7 @@ func TestConfigMapping(t *testing.T) {
 	if !test_helpers.VerifyExistence(t, c) {
 		t.Errorf("%s missing", c)
 	}
-	data, err := ioutil.ReadFile(c)
+	data, err := os.ReadFile(c)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -233,7 +232,7 @@ func Test0100Dir(t *testing.T) {
 		t.Fatal(err)
 	}
 	file := dir + "/hello"
-	err = ioutil.WriteFile(file, []byte("hello"), 0600)
+	err = os.WriteFile(file, []byte("hello"), 0600)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -328,7 +327,7 @@ func TestHardlinkedLongname(t *testing.T) {
 	workdirA, workdirB := newWorkdir(t)
 
 	long1 := workdirA + "/" + strings.Repeat("x", 200)
-	if err := ioutil.WriteFile(long1, []byte("hello"), 0600); err != nil {
+	if err := os.WriteFile(long1, []byte("hello"), 0600); err != nil {
 		t.Fatal(err)
 	}
 	var long1_stat syscall.Stat_t
diff --git a/tests/reverse/ctlsock_test.go b/tests/reverse/ctlsock_test.go
index f59fa45..8f9d843 100644
--- a/tests/reverse/ctlsock_test.go
+++ b/tests/reverse/ctlsock_test.go
@@ -1,7 +1,7 @@
 package reverse_test
 
 import (
-	"io/ioutil"
+	"os"
 	"syscall"
 	"testing"
 
@@ -28,7 +28,7 @@ func TestCtlSockPathOps(t *testing.T) {
 	if plaintextnames {
 		t.Skip("this only tests encrypted names")
 	}
-	mnt, err := ioutil.TempDir(test_helpers.TmpDir, "reverse_mnt_")
+	mnt, err := os.MkdirTemp(test_helpers.TmpDir, "reverse_mnt_")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -74,7 +74,7 @@ func TestCtlSockCrash(t *testing.T) {
 	if plaintextnames {
 		t.Skip("this only tests encrypted names")
 	}
-	mnt, err := ioutil.TempDir(test_helpers.TmpDir, "reverse_mnt_")
+	mnt, err := os.MkdirTemp(test_helpers.TmpDir, "reverse_mnt_")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tests/reverse/force_owner_test.go b/tests/reverse/force_owner_test.go
index 6e47b50..aeb0a4e 100644
--- a/tests/reverse/force_owner_test.go
+++ b/tests/reverse/force_owner_test.go
@@ -1,7 +1,6 @@
 package reverse_test
 
 import (
-	"io/ioutil"
 	"net/url"
 	"os"
 	"syscall"
@@ -13,7 +12,7 @@ import (
 func TestForceOwner(t *testing.T) {
 	// Let's not explode with "TempDir: pattern contains path separator"
 	myEscapedName := url.PathEscape(t.Name())
-	mnt, err := ioutil.TempDir(test_helpers.TmpDir, myEscapedName)
+	mnt, err := os.MkdirTemp(test_helpers.TmpDir, myEscapedName)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tests/reverse/one_file_system_test.go b/tests/reverse/one_file_system_test.go
index 61190ea..5bc965f 100644
--- a/tests/reverse/one_file_system_test.go
+++ b/tests/reverse/one_file_system_test.go
@@ -17,7 +17,7 @@ func TestOneFileSystem(t *testing.T) {
 	}
 	// Let's not explode with "TempDir: pattern contains path separator"
 	myEscapedName := url.PathEscape(t.Name())
-	mnt, err := ioutil.TempDir(test_helpers.TmpDir, myEscapedName)
+	mnt, err := os.MkdirTemp(test_helpers.TmpDir, myEscapedName)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/tests/reverse/xattr_test.go b/tests/reverse/xattr_test.go
index 8002604..a459808 100644
--- a/tests/reverse/xattr_test.go
+++ b/tests/reverse/xattr_test.go
@@ -2,7 +2,7 @@ package reverse_test
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"syscall"
 	"testing"
@@ -29,7 +29,7 @@ func TestXattrList(t *testing.T) {
 		t.Skip()
 	}
 	fnA := filepath.Join(dirA, t.Name())
-	err := ioutil.WriteFile(fnA, nil, 0700)
+	err := os.WriteFile(fnA, nil, 0700)
 	if err != nil {
 		t.Fatalf("creating empty file failed: %v", err)
 	}
-- 
cgit v1.2.3