Replace custom slice concat func with slices.Concat

diff --git a/concat/slices.go b/concat/slices.go
deleted file mode 100644 (file)
index 88b9fae..0000000
--- a/concat/slices.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package concat
-
-// Slices is a utility function to make appending multiple slices less painful and more efficient
-// Source: https://stackoverflow.com/questions/37884361/concat-multiple-slices-in-golang
-func Slices(slices ...[]byte) []byte {
-       var totalLen int
-       for _, s := range slices {
-               totalLen += len(s)
-       }
-       tmp := make([]byte, totalLen)
-       var i int
-       for _, s := range slices {
-               i += copy(tmp[i:], s)
-       }
-
-       return tmp
-}

diff --git a/hotline/field.go b/hotline/field.go
index 4d2962bb3930c2dbce7dd3660150c3f52ec27a24..c205c42b8f2eb5eb43eb45e7d8714ab0c493e920 100644 (file)
--- a/hotline/field.go
+++ b/hotline/field.go
@@ -2,7 +2,7 @@ package hotline
 
 import (
        "encoding/binary"
 
 import (
        "encoding/binary"

-       "github.com/jhalter/mobius/concat"
+       "slices"

 )
 
 // List of Hotline protocol field types taken from the official 1.9 protocol document
 )
 
 // List of Hotline protocol field types taken from the official 1.9 protocol document


@@ -91,7 +91,7 @@ func NewField(id uint16, data []byte) Field {
 }
 
 func (f Field) Payload() []byte {
 }
 
 func (f Field) Payload() []byte {

-       return concat.Slices(f.ID, f.FieldSize, f.Data)
+       return slices.Concat(f.ID, f.FieldSize, f.Data)

 }
 
 func getField(id int, fields *[]Field) *Field {
 }
 
 func getField(id int, fields *[]Field) *Field {

diff --git a/hotline/file_header.go b/hotline/file_header.go
index 60c652e36eb5cf1be776b192ed5bdc822cc71315..61b8e288f4a8d79fb3ee3d42d51b43f9a993c08a 100644 (file)
--- a/hotline/file_header.go
+++ b/hotline/file_header.go
@@ -2,7 +2,7 @@ package hotline
 
 import (
        "encoding/binary"
 
 import (
        "encoding/binary"

-       "github.com/jhalter/mobius/concat"
+       "slices"

 )
 
 type FileHeader struct {
 )
 
 type FileHeader struct {


@@ -28,7 +28,7 @@ func NewFileHeader(fileName string, isDir bool) FileHeader {
 }
 
 func (fh *FileHeader) Payload() []byte {
 }
 
 func (fh *FileHeader) Payload() []byte {

-       return concat.Slices(
+       return slices.Concat(

                fh.Size,
                fh.Type,
                fh.FilePath,
                fh.Size,
                fh.Type,
                fh.FilePath,

diff --git a/hotline/server.go b/hotline/server.go
index aca2221a1adc22676c6bf676e7f7d43f05722d53..78b7a371befa7a69041161848c91e900b678a5f4 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -283,7 +283,7 @@ func NewServer(configDir, netInterface string, netPort int, logger *zap.SugaredL
                        for {
                                tr := &TrackerRegistration{
                                        UserCount:   server.userCount(),
                        for {
                                tr := &TrackerRegistration{
                                        UserCount:   server.userCount(),

-                                       PassID:      server.TrackerPassID[:],
+                                       PassID:      server.TrackerPassID,

                                        Name:        server.Config.Name,
                                        Description: server.Config.Description,
                                }
                                        Name:        server.Config.Name,
                                        Description: server.Config.Description,
                                }

diff --git a/hotline/transaction.go b/hotline/transaction.go
index b01fdfb112e8c6bb61922728cd0d879dabfb00e9..d9bbc22fd1f7c4c3f256434cd45b60b8bc1b3206 100644 (file)
--- a/hotline/transaction.go
+++ b/hotline/transaction.go
@@ -5,8 +5,8 @@ import (
        "encoding/binary"
        "errors"
        "fmt"
        "encoding/binary"
        "errors"
        "fmt"

-       "github.com/jhalter/mobius/concat"

        "math/rand"
        "math/rand"

+       "slices"

 )
 
 const (
 )
 
 const (


@@ -203,7 +203,7 @@ func (t *Transaction) MarshalBinary() (data []byte, err error) {
                fieldPayload = append(fieldPayload, field.Payload()...)
        }
 
                fieldPayload = append(fieldPayload, field.Payload()...)
        }
 

-       return concat.Slices(
+       return slices.Concat(

                []byte{t.Flags, t.IsReply},
                t.Type,
                t.ID,
                []byte{t.Flags, t.IsReply},
                t.Type,
                t.ID,