gsrlabs/sys
1
0
Fork 0
mirror of https://github.com/golang/sys.git synced 2026-01-29 15:12:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

unix: remove the use of ioutil

Browse Source 
Trivial changes.

Change-Id: If7ffa47bb4c3b2bae784091e94516b0f4fc197d2
Reviewed-on: https://go-review.googlesource.com/c/sys/+/526300
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Heschi Kreinick <heschi@google.com>
Run-TryBot: Kirill Kolyshkin <kolyshkin@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
This commit is contained in:
Kir Kolyshkin
2023-09-06 19:16:31 -07:00
committed by Gopher Robot
parent 38ebf4150f
commit 5a17ddab9a
6 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
unix/internal/mkmerge/mkmerge.go
View File

@@ -32,7 +32,6 @@ import (
"go/parser"
"go/token"
"io"
"io/ioutil"
"log"
"os"
"path"
@@ -433,7 +432,7 @@ func merge(mergedFile string, archFiles ...string) error {
// Read architecture files
var inSrc []srcFile
for _, file := range archFiles {
src, err := ioutil.ReadFile(file)
src, err := os.ReadFile(file)
if err != nil {
return fmt.Errorf("cannot read archfile %s: %w", file, err)
}
@@ -485,7 +484,7 @@ func merge(mergedFile string, archFiles ...string) error {
if err != nil {
return err
}
err = ioutil.WriteFile(inFile.name, src, 0644)
err = os.WriteFile(inFile.name, src, 0644)
if err != nil {
return err
}

3
unix/linux/mkall.go
View File

@@ -24,7 +24,6 @@ import (
"fmt"
"go/build/constraint"
"io"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -810,7 +809,7 @@ func generatePtraceRegSet(arch string) error {
// ptraceDef returns the definition of PtraceRegs for arch.
func ptraceDef(arch string) (string, error) {
filename := fmt.Sprintf("ztypes_linux_%s.go", arch)
data, err := ioutil.ReadFile(filename)
data, err := os.ReadFile(filename)
if err != nil {
return "", fmt.Errorf("reading %s: %v", filename, err)
}

7
unix/mkasm.go
View File

@@ -12,7 +12,6 @@ package main
import (
"bytes"
"fmt"
"io/ioutil"
"log"
"os"
"sort"
@@ -35,7 +34,7 @@ func generateASMFile(goos, arch string, inFileNames []string, outFileName string
trampolines := map[string]bool{}
var orderedTrampolines []string
for _, inFileName := range inFileNames {
in, err := ioutil.ReadFile(inFileName)
in, err := os.ReadFile(inFileName)
if err != nil {
log.Fatalf("Failed to read file: %v", err)
}
@@ -72,7 +71,7 @@ func generateASMFile(goos, arch string, inFileNames []string, outFileName string
fmt.Fprintf(&out, "DATA\t·%s_trampoline_addr(SB)/%d, $%s_trampoline<>(SB)\n", fn, ptrSize, fn)
}
if err := ioutil.WriteFile(outFileName, out.Bytes(), 0644); err != nil {
if err := os.WriteFile(outFileName, out.Bytes(), 0644); err != nil {
log.Fatalf("Failed to write assembly file %q: %v", outFileName, err)
}
@@ -110,7 +109,7 @@ func writeDarwinTest(trampolines map[string]bool, fileName, arch string) {
out.Reset()
fmt.Fprintf(&out, darwinTestTemplate, strings.Join(os.Args[1:], " "), arch, lines)
if err := ioutil.WriteFile(fileName, out.Bytes(), 0644); err != nil {
if err := os.WriteFile(fileName, out.Bytes(), 0644); err != nil {
log.Fatalf("Failed to write test file %q: %v", fileName, err)
}
}

4
unix/mkpost.go
View File

@@ -16,7 +16,7 @@ import (
"bytes"
"fmt"
"go/format"
"io/ioutil"
"io"
"log"
"os"
"regexp"
@@ -41,7 +41,7 @@ func main() {
}
}
b, err := ioutil.ReadAll(os.Stdin)
b, err := io.ReadAll(os.Stdin)
if err != nil {
log.Fatal(err)
}

7
unix/mksyscall_aix_ppc64.go
View File

@@ -66,7 +66,6 @@ import (
"bufio"
"flag"
"fmt"
"io/ioutil"
"os"
"regexp"
"strings"
@@ -525,7 +524,7 @@ func main() {
}
// Print zsyscall_aix_ppc64.go
err := ioutil.WriteFile("zsyscall_aix_ppc64.go",
err := os.WriteFile("zsyscall_aix_ppc64.go",
[]byte(fmt.Sprintf(srcTemplate1, cmdLine(), goBuildTags(), plusBuildTags(), pack, imp, textcommon)),
0644)
if err != nil {
@@ -536,7 +535,7 @@ func main() {
// Print zsyscall_aix_ppc64_gc.go
vardecls := "\t" + strings.Join(vars, ",\n\t")
vardecls += " syscallFunc"
err = ioutil.WriteFile("zsyscall_aix_ppc64_gc.go",
err = os.WriteFile("zsyscall_aix_ppc64_gc.go",
[]byte(fmt.Sprintf(srcTemplate2, cmdLine(), goBuildTags(), plusBuildTags(), pack, imp, dynimports, linknames, vardecls, textgc)),
0644)
if err != nil {
@@ -545,7 +544,7 @@ func main() {
}
// Print zsyscall_aix_ppc64_gccgo.go
err = ioutil.WriteFile("zsyscall_aix_ppc64_gccgo.go",
err = os.WriteFile("zsyscall_aix_ppc64_gccgo.go",
[]byte(fmt.Sprintf(srcTemplate3, cmdLine(), goBuildTags(), plusBuildTags(), pack, cExtern, imp, textgccgo)),
0644)
if err != nil {

3
unix/mksysnum.go
View File

@@ -14,7 +14,6 @@ import (
"bufio"
"fmt"
"io"
"io/ioutil"
"net/http"
"os"
"regexp"
@@ -67,7 +66,7 @@ func fetchFile(URL string) io.Reader {
resp, err := http.Get(URL)
checkErr(err)
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
checkErr(err)
return strings.NewReader(string(body))
}