Skip to content

Commit 75df151

Browse files
MagicalTuxclaude
andcommitted
fix staticcheck warnings
- use snappy.NewBufferedWriter instead of deprecated NewWriter - simplify channel receive instead of select with single case - remove unnecessary nil check before range - lowercase error string - check error from startProxyPort before deferring Close - remove unused struct fields (tgtW, expanded) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 57bcfe5 commit 75df151

6 files changed

Lines changed: 18 additions & 15 deletions

File tree

interco.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ func interco(c1, c2 net.Conn, compress bool) {
2828
defer doClose()
2929
if compress {
3030
// snappy compression
31-
io.Copy(snappy.NewWriter(c1), c2)
31+
w := snappy.NewBufferedWriter(c1)
32+
io.Copy(w, c2)
33+
w.Close()
3234
} else {
3335
io.Copy(c1, c2)
3436
}
@@ -46,7 +48,5 @@ func interco(c1, c2 net.Conn, compress bool) {
4648
}()
4749

4850
// wait for close signal
49-
select {
50-
case <-cl:
51-
}
51+
<-cl
5252
}

login.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,9 @@ func (l *loginShells) checkSession() bool {
134134

135135
func (l *loginShells) call(vars map[string]interface{}) {
136136
req := make(map[string]interface{})
137-
if vars != nil {
138-
// duplicate values
139-
for k, v := range vars {
140-
req[k] = v
141-
}
137+
// duplicate values
138+
for k, v := range vars {
139+
req[k] = v
142140
}
143141
req["client_id"] = clientID
144142
if l.session != "" {

shells.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func (s *shell) ProxyConnect(port uint16, compress bool, timeout time.Duration)
155155
return nil, err
156156
}
157157
if res[0] != 0 {
158-
return nil, errors.New("Connection has failed")
158+
return nil, errors.New("connection has failed")
159159
}
160160
c.SetReadDeadline(time.Time{})
161161

@@ -256,6 +256,10 @@ func (s *shell) tryRdp() {
256256
c.Close()
257257

258258
l, err := s.startProxyPort(3389, false)
259+
if err != nil {
260+
log.Printf("rdp: failed to start proxy port: %s", err)
261+
return
262+
}
259263
defer l.Close()
260264

261265
addr := l.Addr().(*net.TCPAddr)

snappy.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,13 @@ func (s *snappyConn) Read(b []byte) (int, error) {
3535

3636
func (s *snappyConn) Write(b []byte) (int, error) {
3737
if s.sw == nil {
38-
s.sw = snappy.NewWriter(s.c)
38+
s.sw = snappy.NewBufferedWriter(s.c)
3939
}
40-
return s.sw.Write(b)
40+
n, err := s.sw.Write(b)
41+
if err != nil {
42+
return n, err
43+
}
44+
return n, s.sw.Flush()
4145
}
4246

4347
func (s *snappyConn) SetDeadline(t time.Time) error {

spicefyne/control.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ type control struct {
1616
visible bool
1717
parent *SpiceFyne
1818
sidebarPosition string
19-
tgtW float32
2019

2120
muteIconContainer *fyne.Container
2221
sidebar *fyne.Container

spicefyne/widget.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ type SpiceFyne struct {
3939

4040
cursorObj *fyneCursor
4141

42-
expanded bool
43-
4442
// focus
4543
focused bool
4644

0 commit comments

Comments
 (0)