Skip to content

Commit f117738

Browse files
bump golangci-lint to 2.8.0 (#983)
1 parent 54c9dfe commit f117738

File tree

8 files changed

+63
-16
lines changed

8 files changed

+63
-16
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
- uses: golangci/golangci-lint-action@v9
2424
with:
25-
version: v2.6.1
25+
version: v2.8.0
2626

2727
go_mod:
2828
runs-on: ubuntu-22.04

client.go

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,27 @@ func ssrcsMapToList(m map[uint8]uint32) []uint32 {
7575
}
7676

7777
func clientExtractExistingSSRCs(setuppedMedias map[*description.Media]*clientMedia) []uint32 {
78-
var ret []uint32
78+
n := 0
79+
for _, media := range setuppedMedias {
80+
for range media.formats {
81+
n++
82+
}
83+
}
84+
85+
if n == 0 {
86+
return nil
87+
}
88+
89+
ret := make([]uint32, n)
90+
n = 0
91+
7992
for _, media := range setuppedMedias {
8093
for _, forma := range media.formats {
81-
ret = append(ret, forma.localSSRC)
94+
ret[n] = forma.localSSRC
95+
n++
8296
}
8397
}
98+
8499
return ret
85100
}
86101

pkg/base/header.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,10 @@ func (h Header) marshalSize() int {
104104
// sort headers by key
105105
// in order to obtain deterministic results
106106
keys := make([]string, len(h))
107+
i := 0
107108
for key := range h {
108-
keys = append(keys, key)
109+
keys[i] = key
110+
i++
109111
}
110112
sort.Strings(keys)
111113

@@ -126,8 +128,10 @@ func (h Header) marshalTo(buf []byte) int {
126128
// sort headers by key
127129
// in order to obtain deterministic results
128130
keys := make([]string, len(h))
131+
i := 0
129132
for key := range h {
130-
keys = append(keys, key)
133+
keys[i] = key
134+
i++
131135
}
132136
sort.Strings(keys)
133137

pkg/format/rtplpcm/decoder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func TestDecode(t *testing.T) {
1919
err := d.Init()
2020
require.NoError(t, err)
2121

22-
var samples []byte
22+
var samples []byte //nolint:prealloc
2323

2424
for _, pkt := range ca.pkts {
2525
var partial []byte

pkg/headers/authenticate.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,10 @@ func (h *Authenticate) Unmarshal(v base.HeaderValue) error {
7676

7777
v0 := v[0]
7878

79-
i := strings.IndexByte(v0, ' ')
80-
if i < 0 {
79+
method, v0, found := strings.Cut(v0, " ")
80+
if !found {
8181
return fmt.Errorf("unable to split between method and keys (%v)", v0)
8282
}
83-
method, v0 := v0[:i], v0[i+1:]
8483

8584
switch method {
8685
case "Basic":

pkg/headers/authorization.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,10 @@ func (h *Authorization) Unmarshal(v base.HeaderValue) error {
5858

5959
v0 := v[0]
6060

61-
i := strings.IndexByte(v0, ' ')
62-
if i < 0 {
61+
method, v0, found := strings.Cut(v0, " ")
62+
if !found {
6363
return fmt.Errorf("unable to split between method and keys (%v)", v0)
6464
}
65-
method, v0 := v0[:i], v0[i+1:]
6665

6766
switch method {
6867
case "Basic":

server_session.go

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,27 @@ import (
3232
type readFunc func([]byte) bool
3333

3434
func serverSessionExtractExistingSSRCs(medias map[*description.Media]*serverSessionMedia) []uint32 {
35-
var ret []uint32
35+
n := 0
36+
for _, media := range medias {
37+
for range media.formats {
38+
n++
39+
}
40+
}
41+
42+
if n == 0 {
43+
return nil
44+
}
45+
46+
ret := make([]uint32, n)
47+
n = 0
48+
3649
for _, media := range medias {
3750
for _, forma := range media.formats {
38-
ret = append(ret, forma.localSSRC)
51+
ret[n] = forma.localSSRC
52+
n++
3953
}
4054
}
55+
4156
return ret
4257
}
4358

server_stream.go

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,27 @@ import (
1616
)
1717

1818
func serverStreamExtractExistingSSRCs(medias map[*description.Media]*serverStreamMedia) []uint32 {
19-
var ret []uint32
19+
n := 0
20+
for _, media := range medias {
21+
for range media.formats {
22+
n++
23+
}
24+
}
25+
26+
if n == 0 {
27+
return nil
28+
}
29+
30+
ret := make([]uint32, n)
31+
n = 0
32+
2033
for _, media := range medias {
2134
for _, forma := range media.formats {
22-
ret = append(ret, forma.localSSRC)
35+
ret[n] = forma.localSSRC
36+
n++
2337
}
2438
}
39+
2540
return ret
2641
}
2742

0 commit comments

Comments
 (0)