mirrors/Xray-core
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-06-12 11:29:36 +03:00
Code Issues Releases Activity

Move from deprecated ioutil to os and io packages (#744)

Browse Source
This commit is contained in:
KallyDev
2021-09-29 02:49:34 +08:00
committed by GitHub
parent 1ef824c0b4
commit 4abf98c1be
17 changed files with 29 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/commands/all/api/shared.go
View File

@ -6,7 +6,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
"os"
@ -56,10 +55,10 @@ func loadArg(arg string) (out io.Reader, err error) {
data, err = fetchHTTPContent(arg)
case arg == "stdin:":
data, err = ioutil.ReadAll(os.Stdin)
data, err = io.ReadAll(os.Stdin)
default:
data, err = ioutil.ReadFile(arg)
data, err = os.ReadFile(arg)
}
if err != nil {

5
main/commands/all/convert.go
View File

@ -4,7 +4,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
"os"
@ -77,10 +76,10 @@ func loadArg(arg string) (out io.Reader, err error) {
data, err = FetchHTTPContent(arg)
case arg == "stdin:":
data, err = ioutil.ReadAll(os.Stdin)
data, err = io.ReadAll(os.Stdin)
default:
data, err = ioutil.ReadFile(arg)
data, err = os.ReadFile(arg)
}
if err != nil {

5
main/confloader/external/external.go vendored
View File

@ -5,7 +5,6 @@ package external
import (
"bytes"
"io"
"io/ioutil"
"net/http"
"net/url"
"os"
@ -24,10 +23,10 @@ func ConfigLoader(arg string) (out io.Reader, err error) {
data, err = FetchHTTPContent(arg)
case arg == "stdin:":
data, err = ioutil.ReadAll(os.Stdin)
data, err = io.ReadAll(os.Stdin)
default:
data, err = ioutil.ReadFile(arg)
data, err = os.ReadFile(arg)
}
if err != nil {

3
main/run.go
View File

@ -2,7 +2,6 @@ package main
import (
"fmt"
"io/ioutil"
"log"
"os"
"os/signal"
@ -126,7 +125,7 @@ func getRegepxByFormat() string {
}
func readConfDir(dirPath string) {
confs, err := ioutil.ReadDir(dirPath)
confs, err := os.ReadDir(dirPath)
if err != nil {
log.Fatalln(err)
}