From 7c417373706fa90a12ea2dc643cebba4ac872eec Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 21 Sep 2022 19:51:09 +0530 Subject: [PATCH] Couple more errors found by linting --- tools/cmd/at/main.go | 2 +- tools/cmd/at/main_test.go | 3 +++ tools/cmd/at/socket_io.go | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/cmd/at/main.go b/tools/cmd/at/main.go index f1a88ba42..fd044b290 100644 --- a/tools/cmd/at/main.go +++ b/tools/cmd/at/main.go @@ -263,7 +263,7 @@ func get_password(password string, password_file string, password_env string, us } ttyf, err := os.Open(tty.Ctermid()) if err == nil { - err = unix.Dup2(int(ttyf.Fd()), int(os.Stdin.Fd())) + err = unix.Dup2(int(ttyf.Fd()), int(os.Stdin.Fd())) //nolint ineffassign err is returned indicating duping failed ttyf.Close() } } diff --git a/tools/cmd/at/main_test.go b/tools/cmd/at/main_test.go index 412482246..cb7d77dad 100644 --- a/tools/cmd/at/main_test.go +++ b/tools/cmd/at/main_test.go @@ -70,6 +70,9 @@ func TestRCSerialization(t *testing.T) { t.Fatal(err) } raw, err := io_data.serializer(&rc) + if err != nil { + t.Fatal(err) + } var ec utils.EncryptedRemoteControlCmd err = json.Unmarshal([]byte(raw), &ec) if err != nil { diff --git a/tools/cmd/at/socket_io.go b/tools/cmd/at/socket_io.go index a9e927e9b..a98d65588 100644 --- a/tools/cmd/at/socket_io.go +++ b/tools/cmd/at/socket_io.go @@ -108,7 +108,6 @@ func simple_socket_io(conn *net.Conn, io_data *rc_io_data) (serialized_response const ( BEFORE_FIRST_ESCAPE_CODE_SENT = iota SENDING - WAITING_FOR_RESPONSE ) state := BEFORE_FIRST_ESCAPE_CODE_SENT @@ -124,7 +123,6 @@ func simple_socket_io(conn *net.Conn, io_data *rc_io_data) (serialized_response return } if len(chunk) == 0 { - state = WAITING_FOR_RESPONSE break } err = write_many_to_conn(conn, []byte(cmd_escape_code_prefix), chunk, []byte(cmd_escape_code_suffix))