Skip to content

Commit 0ece51e

Browse files
committed
remove more go warnings
1 parent 724a683 commit 0ece51e

3 files changed

Lines changed: 18 additions & 19 deletions

File tree

waveshell/pkg/cmdtail/cmdtail.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func (t *Tailer) addSessionWatcher(sessionId string) error {
137137
defer t.Lock.Unlock()
138138

139139
if t.Sessions[sessionId] {
140-
return
140+
return nil
141141
}
142142
sdir := t.Gen.SessionDir(sessionId)
143143
err := t.Watcher.Add(sdir)
@@ -351,7 +351,6 @@ func (t *Tailer) Run() {
351351
t.Sender.SendPacket(packet.FmtMessagePacket("error in tailer: %v", err))
352352
}
353353
}
354-
return
355354
}
356355

357356
func (t *Tailer) Close() error {

wavesrv/pkg/cmdrunner/cmdrunner.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ var SetVarNameMap map[string]string = map[string]string{
9393
}
9494

9595
var SetVarScopes = []SetVarScope{
96-
SetVarScope{ScopeName: "global", VarNames: []string{}},
97-
SetVarScope{ScopeName: "client", VarNames: []string{"telemetry"}},
98-
SetVarScope{ScopeName: "session", VarNames: []string{"name", "pos"}},
99-
SetVarScope{ScopeName: "screen", VarNames: []string{"name", "tabcolor", "tabicon", "pos", "pterm", "anchor", "focus", "line"}},
100-
SetVarScope{ScopeName: "line", VarNames: []string{}},
96+
{ScopeName: "global", VarNames: []string{}},
97+
{ScopeName: "client", VarNames: []string{"telemetry"}},
98+
{ScopeName: "session", VarNames: []string{"name", "pos"}},
99+
{ScopeName: "screen", VarNames: []string{"name", "tabcolor", "tabicon", "pos", "pterm", "anchor", "focus", "line"}},
100+
{ScopeName: "line", VarNames: []string{}},
101101
// connection = remote, remote = remoteinstance
102-
SetVarScope{ScopeName: "connection", VarNames: []string{"alias", "connectmode", "key", "password", "autoinstall", "color"}},
103-
SetVarScope{ScopeName: "remote", VarNames: []string{}},
102+
{ScopeName: "connection", VarNames: []string{"alias", "connectmode", "key", "password", "autoinstall", "color"}},
103+
{ScopeName: "remote", VarNames: []string{}},
104104
}
105105

106106
var hostNameRe = regexp.MustCompile("^[a-z][a-z0-9.-]*$")

wavesrv/pkg/cmdrunner/shparse.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ type BareMetaCmdDecl struct {
2525
}
2626

2727
var BareMetaCmds = []BareMetaCmdDecl{
28-
BareMetaCmdDecl{"cr", "cr"},
29-
BareMetaCmdDecl{"connect", "cr"},
30-
BareMetaCmdDecl{"clear", "clear"},
31-
BareMetaCmdDecl{"reset", "reset"},
32-
BareMetaCmdDecl{"codeedit", "codeedit"},
33-
BareMetaCmdDecl{"codeview", "codeview"},
34-
BareMetaCmdDecl{"imageview", "imageview"},
35-
BareMetaCmdDecl{"markdownview", "markdownview"},
36-
BareMetaCmdDecl{"mdview", "markdownview"},
37-
BareMetaCmdDecl{"csvview", "csvview"},
28+
{"cr", "cr"},
29+
{"connect", "cr"},
30+
{"clear", "clear"},
31+
{"reset", "reset"},
32+
{"codeedit", "codeedit"},
33+
{"codeview", "codeview"},
34+
{"imageview", "imageview"},
35+
{"markdownview", "markdownview"},
36+
{"mdview", "markdownview"},
37+
{"csvview", "csvview"},
3838
}
3939

4040
const (

0 commit comments

Comments
 (0)