From 5e1931a11c15def7babbda0f29da38c6d2a91ac7 Mon Sep 17 00:00:00 2001 From: Andy Wang Date: Sat, 4 Apr 2020 16:10:43 +0100 Subject: [PATCH] Ineffectual assignments --- cmd/ck-client/ck-client.go | 4 ++-- internal/multiplex/session_test.go | 2 +- internal/util/util.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/ck-client/ck-client.go b/cmd/ck-client/ck-client.go index 6a5aeaf..9f9f2bf 100644 --- a/cmd/ck-client/ck-client.go +++ b/cmd/ck-client/ck-client.go @@ -138,7 +138,7 @@ start: stream.Close() break } - i, err = localConn.WriteToUDP(buf[:i], otherEnd.Load().(*net.UDPAddr)) + _, err = localConn.WriteToUDP(buf[:i], otherEnd.Load().(*net.UDPAddr)) if err != nil { log.Print(err) localConn.Close() @@ -164,7 +164,7 @@ start: break } otherEnd.Store(oe) - i, err = stream.Write(buf[:i]) + _, err = stream.Write(buf[:i]) if err != nil { localConn.Close() stream.Close() diff --git a/internal/multiplex/session_test.go b/internal/multiplex/session_test.go index 90a778a..e14fe74 100644 --- a/internal/multiplex/session_test.go +++ b/internal/multiplex/session_test.go @@ -172,7 +172,7 @@ func TestRecvDataFromRemote_Closing_InOrder(t *testing.T) { if err != nil { t.Fatalf("receiving normal frame for stream 1: %v", err) } - s1I, ok := sesh.streams.Load(f1.StreamID) + _, ok := sesh.streams.Load(f1.StreamID) if !ok { t.Fatal("failed to fetch stream 1 after receiving it") } diff --git a/internal/util/util.go b/internal/util/util.go index f871ef9..8105ed5 100644 --- a/internal/util/util.go +++ b/internal/util/util.go @@ -68,7 +68,7 @@ func ReadTLS(conn net.Conn, buffer []byte) (n int, err error) { // a single message can also be segmented due to MTU of the IP layer. // This function guareentees a single TLS message to be read and everything // else is left in the buffer. - i, err := io.ReadFull(conn, buffer[:5]) + _, err = io.ReadFull(conn, buffer[:5]) if err != nil { return } @@ -87,7 +87,7 @@ func ReadTLS(conn net.Conn, buffer []byte) (n int, err error) { // if left < buffer size (i.e. multiple messages came together), // only the message we want is read - i, err = conn.Read(buffer[readPtr : readPtr+left]) + i, err := conn.Read(buffer[readPtr : readPtr+left]) if err != nil { return } @@ -129,7 +129,7 @@ func Pipe(dst net.Conn, src net.Conn, srcReadTimeout time.Duration) { src.Close() return } - i, err = dst.Write(buf[:i]) + _, err = dst.Write(buf[:i]) if err != nil { dst.Close() src.Close()