From 4359978ef22a22ddd5a19adf18cbc80cb44244fb Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Thu, 23 Feb 2023 14:28:18 +0100
Subject: all: ioutil is deprecated in go1.19 (#3718)

---
 pkg/db/db.go      | 3 +--
 pkg/db/db_test.go | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'pkg/db')

diff --git a/pkg/db/db.go b/pkg/db/db.go
index ae0c374e9..203761dfa 100644
--- a/pkg/db/db.go
+++ b/pkg/db/db.go
@@ -15,7 +15,6 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 
 	"github.com/google/syzkaller/pkg/hash"
@@ -265,7 +264,7 @@ func deserializeRecord(r *bufio.Reader) (key string, val []byte, seq uint64, err
 	}
 	if valLen != 0 {
 		fr := flate.NewReader(&io.LimitedReader{R: r, N: int64(valLen)})
-		if val, err = ioutil.ReadAll(fr); err != nil {
+		if val, err = io.ReadAll(fr); err != nil {
 			return
 		}
 		fr.Close()
diff --git a/pkg/db/db_test.go b/pkg/db/db_test.go
index f6917ef17..8319e73d1 100644
--- a/pkg/db/db_test.go
+++ b/pkg/db/db_test.go
@@ -5,7 +5,6 @@ package db
 
 import (
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"reflect"
@@ -120,7 +119,7 @@ func TestLarge(t *testing.T) {
 }
 
 func TestOpenInvalid(t *testing.T) {
-	f, err := ioutil.TempFile("", "syz-db-test")
+	f, err := os.CreateTemp("", "syz-db-test")
 	if err != nil {
 		t.Error(err)
 	}
@@ -141,7 +140,7 @@ func TestOpenInaccessible(t *testing.T) {
 	if os.Getuid() == 0 {
 		t.Skip("opening inaccessible file won't fail under root")
 	}
-	f, err := ioutil.TempFile("", "syz-db-test")
+	f, err := os.CreateTemp("", "syz-db-test")
 	if err != nil {
 		t.Error(err)
 	}
@@ -171,7 +170,7 @@ func TestOpenCorrupted(t *testing.T) {
 	if err := db.Flush(); err != nil {
 		t.Fatalf("failed to flush db: %v", err)
 	}
-	data, err := ioutil.ReadFile(fn)
+	data, err := os.ReadFile(fn)
 	if err != nil {
 		t.Fatalf("failed to read db: %v", err)
 	}
-- 
cgit mrf-deployment