From 7a72f1a2531d728d14faf5f61909f9ffa63c8dd3 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Thu, 15 Feb 2024 17:09:13 +0900 Subject: Code cleanup: Remove unused argument --- src/reader.go | 12 ++++-------- src/reader_test.go | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/reader.go b/src/reader.go index ce5950d7..2210bafe 100644 --- a/src/reader.go +++ b/src/reader.go @@ -88,7 +88,7 @@ func (r *Reader) terminate() { func (r *Reader) restart(command string) { r.event = int32(EvtReady) r.startEventPoller() - success := r.readFromCommand(nil, command) + success := r.readFromCommand(command) r.fin(success) } @@ -101,7 +101,7 @@ func (r *Reader) ReadSource() { if len(cmd) == 0 { success = r.readFiles() } else { - success = r.readFromCommand(nil, cmd) + success = r.readFromCommand(cmd) } } else { success = r.readFromStdin() @@ -171,15 +171,11 @@ func (r *Reader) readFiles() bool { return fastwalk.Walk(&conf, ".", fn) == nil } -func (r *Reader) readFromCommand(shell *string, command string) bool { +func (r *Reader) readFromCommand(command string) bool { r.mutex.Lock() r.killed = false r.command = &command - if shell != nil { - r.exec = util.ExecCommandWith(*shell, command, true) - } else { - r.exec = util.ExecCommand(command, true) - } + r.exec = util.ExecCommand(command, true) out, err := r.exec.StdoutPipe() if err != nil { r.mutex.Unlock() diff --git a/src/reader_test.go b/src/reader_test.go index feb45fc5..8a138da7 100644 --- a/src/reader_test.go +++ b/src/reader_test.go @@ -22,7 +22,7 @@ func TestReadFromCommand(t *testing.T) { } // Normal command - reader.fin(reader.readFromCommand(nil, `echo abc&&echo def`)) + reader.fin(reader.readFromCommand(`echo abc&&echo def`)) if len(strs) != 2 || strs[0] != "abc" || strs[1] != "def" { t.Errorf("%s", strs) } @@ -47,7 +47,7 @@ func TestReadFromCommand(t *testing.T) { reader.startEventPoller() // Failing command - reader.fin(reader.readFromCommand(nil, `no-such-command`)) + reader.fin(reader.readFromCommand(`no-such-command`)) strs = []string{} if len(strs) > 0 { t.Errorf("%s", strs) -- cgit v1.2.3