Replace deprecated iotuil usage

diff --git a/hotline/server.go b/hotline/server.go
index f4a2ad4acca78cee7b7317aea7737cba3b4c1528..a3508b20d1035aed9b5d3ff51c5ea20e518a4f47 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -11,7 +11,6 @@ import (
        "gopkg.in/yaml.v3"
        "io"
        "io/fs"
        "gopkg.in/yaml.v3"
        "io"
        "io/fs"

-       "io/ioutil"

        "math/big"
        "math/rand"
        "net"
        "math/big"
        "math/rand"
        "net"


@@ -339,7 +338,7 @@ func (s *Server) writeBanList() error {
        if err != nil {
                return err
        }
        if err != nil {
                return err
        }

-       err = ioutil.WriteFile(
+       err = os.WriteFile(

                filepath.Join(s.ConfigDir, "Banlist.yaml"),
                out,
                0666,
                filepath.Join(s.ConfigDir, "Banlist.yaml"),
                out,
                0666,


@@ -1210,7 +1209,7 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
                                                return err
                                        }
 
                                                return err
                                        }
 

-                                       if err := receiveFile(rwc, file, ioutil.Discard, ioutil.Discard, fileTransfer.bytesSentCounter); err != nil {
+                                       if err := receiveFile(rwc, file, io.Discard, io.Discard, fileTransfer.bytesSentCounter); err != nil {

                                                s.Logger.Error(err)
                                        }
 
                                                s.Logger.Error(err)
                                        }
 

diff --git a/hotline/ui.go b/hotline/ui.go
index c005fb438001969d03e3fdbc7c629daa07152ec5..45c452cbbeaea6d2aec2788e0c7e60573b8daa63 100644 (file)
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -5,7 +5,6 @@ import (
        "github.com/gdamore/tcell/v2"
        "github.com/rivo/tview"
        "gopkg.in/yaml.v3"
        "github.com/gdamore/tcell/v2"
        "github.com/rivo/tview"
        "gopkg.in/yaml.v3"

-       "io/ioutil"

        "os"
        "strconv"
        "strings"
        "os"
        "strconv"
        "strings"


@@ -161,7 +160,7 @@ func (ui *UI) renderSettingsForm() *tview.Flex {
                        // TODO: handle err
                }
                // TODO: handle err
                        // TODO: handle err
                }
                // TODO: handle err

-               err = ioutil.WriteFile(ui.HLClient.cfgPath, out, 0666)
+               err = os.WriteFile(ui.HLClient.cfgPath, out, 0666)

                if err != nil {
                        println(ui.HLClient.cfgPath)
                        panic(err)
                if err != nil {
                        println(ui.HLClient.cfgPath)
                        panic(err)


@@ -236,7 +235,7 @@ func (ui *UI) renderJoinServerForm(name, server, login, password, backPage strin
                                panic(err)
                        }
 
                                panic(err)
                        }
 

-                       err = ioutil.WriteFile(ui.HLClient.cfgPath, out, 0666)
+                       err = os.WriteFile(ui.HLClient.cfgPath, out, 0666)

                        if err != nil {
                                panic(err)
                        }
                        if err != nil {
                                panic(err)
                        }