Skip to content

Commit e09b135

Browse files
jechjech
committed
Run gofmt.
1 parent 400d821 commit e09b135

File tree

10 files changed

+38
-38
lines changed

10 files changed

+38
-38
lines changed

‎codecs/codecs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ func PacketFlags(codec string, buf []byte) (Flags, error) {
290290
flags.Start = vp9.B
291291
flags.End = vp9.E
292292
if vp9.B && len(vp9.Payload) > 0 &&
293-
(vp9.Payload[0] & 0xc0) == 0x80 {
293+
(vp9.Payload[0]&0xc0) == 0x80 {
294294
profile := (vp9.Payload[0] >> 4) & 0x3
295295
if profile != 3 {
296296
flags.Keyframe = (vp9.Payload[0] & 0xC) == 0

‎diskwriter/diskwriter_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestAdjustOriginLocalNow(t *testing.T) {
2828

2929
c := &diskConn{
3030
tracks: []*diskTrack{
31-
&diskTrack{},
31+
{},
3232
},
3333
}
3434
for _, t := range c.tracks {
@@ -56,7 +56,7 @@ func TestAdjustOriginLocalEarlier(t *testing.T) {
5656
c := &diskConn{
5757
originLocal: earlier,
5858
tracks: []*diskTrack{
59-
&diskTrack{},
59+
{},
6060
},
6161
}
6262
for _, t := range c.tracks {
@@ -84,7 +84,7 @@ func TestAdjustOriginLocalLater(t *testing.T) {
8484
c := &diskConn{
8585
originLocal: later,
8686
tracks: []*diskTrack{
87-
&diskTrack{},
87+
{},
8888
},
8989
}
9090
for _, t := range c.tracks {
@@ -111,7 +111,7 @@ func TestAdjustOriginRemote(t *testing.T) {
111111

112112
c := &diskConn{
113113
tracks: []*diskTrack{
114-
&diskTrack{
114+
{
115115
remoteNTP: rtptime.TimeToNTP(earlier),
116116
remoteRTP: 32,
117117
},
@@ -144,7 +144,7 @@ func TestAdjustOriginLocalRemote(t *testing.T) {
144144

145145
c := &diskConn{
146146
tracks: []*diskTrack{
147-
&diskTrack{},
147+
{},
148148
},
149149
}
150150
for _, t := range c.tracks {

‎estimator/estimator_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package estimator
22

33
import (
4-
"testing"
5-
"time"
64
"sync"
75
"sync/atomic"
6+
"testing"
7+
"time"
88

99
"github.com/jech/galene/rtptime"
1010
)
@@ -87,7 +87,7 @@ func TestEstimatorParallel(t *testing.T) {
8787
addNow(rtptime.JiffiesPerSec / 1000)
8888
b, p := estimate()
8989
if i >= 1000 {
90-
if b != p * 42 {
90+
if b != p*42 {
9191
t.Errorf("%v: Got %v %v (%v), expected %v %v",
9292
n, p, b, i, 1000, p*42,
9393
)
@@ -115,7 +115,7 @@ func BenchmarkEstimator(b *testing.B) {
115115
e.Estimate()
116116
b.ResetTimer()
117117

118-
for i := 0; i < 1000 * b.N; i++ {
118+
for i := 0; i < 1000*b.N; i++ {
119119
e.Accumulate(100)
120120

121121
}
@@ -130,7 +130,7 @@ func BenchmarkEstimatorParallel(b *testing.B) {
130130
e.Estimate()
131131
b.ResetTimer()
132132

133-
b.RunParallel(func (pb *testing.PB) {
133+
b.RunParallel(func(pb *testing.PB) {
134134
for pb.Next() {
135135
for i := 0; i < 1000; i++ {
136136
e.Accumulate(100)

‎group/group.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ func (g *Group) userExists(username string) bool {
10211021
return found
10221022
}
10231023

1024-
//validUsername returns true if a string is a valid username.
1024+
// validUsername returns true if a string is a valid username.
10251025
// On the one hand, we want to allow usernames such as "jch@work"
10261026
// or "Alice c/o Bob". On the other hand, not restricting
10271027
// usernames might lead to security vulnaribilities.

‎packetmap/packetmap.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func (m *Map) Map(seqno uint16, pid uint16) (bool, uint16, uint16) {
3131

3232
if m.delta == 0 && m.entries == nil {
3333
if compare(m.next, seqno) <= 0 ||
34-
uint16(m.next - seqno) > 8 * 1024 {
34+
uint16(m.next-seqno) > 8*1024 {
3535
m.next = seqno + 1
3636
m.nextPid = pid
3737
}
@@ -192,7 +192,7 @@ func (m *Map) Drop(seqno uint16, pid uint16) bool {
192192

193193
if len(m.entries) == 0 {
194194
m.entries = []entry{
195-
entry{
195+
{
196196
first: seqno - 8192,
197197
count: 8192,
198198
delta: 0,

‎packetmap/packetmap_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,14 @@ func TestWraparound(t *testing.T) {
165165
}
166166

167167
for i := 4; i < 256000; i++ {
168-
ok, s, p = m.Map(uint16(i), uint16((i/2) & 0x7FFF))
168+
ok, s, p = m.Map(uint16(i), uint16((i/2)&0x7FFF))
169169
if !ok || s != uint16(i-2) || p != 1 {
170170
t.Errorf("Expected %v, %v, got %v, %v, %v",
171171
uint16(i-2), 1, ok, s, p)
172172
}
173173
}
174174

175-
ok, s, p = m.Map((256000 & 0xFFFF) + 2, 1)
175+
ok, s, p = m.Map((256000&0xFFFF)+2, 1)
176176
expect := uint16((256000) & 0xFFFF)
177177
if !ok || s != expect || p != 1 {
178178
t.Errorf("Expected %v, 1, got %v, %v, %v", expect, ok, s, p)
@@ -202,25 +202,25 @@ func TestWraparoundDrop(t *testing.T) {
202202
t.Errorf("Expected 1, got %v, %v", ok, m.pidDelta)
203203
}
204204

205-
for i := 4; i < 256000; i+= 3 {
206-
ok, s, p = m.Map(uint16(i), uint16((i/2) & 0x7FFF))
205+
for i := 4; i < 256000; i += 3 {
206+
ok, s, p = m.Map(uint16(i), uint16((i/2)&0x7FFF))
207207
if !ok || s != uint16((i-1)/3*2) || p != 1 {
208208
t.Errorf("Expected %v, %v, got %v, %v, %v",
209209
uint16((i-1)/3*2), 1, ok, s, p)
210210
}
211-
ok, s, p = m.Map(uint16(i + 1), uint16((i/2) & 0x7FFF))
212-
if !ok || s != uint16((i-1)/3*2 + 1) || p != 1 {
211+
ok, s, p = m.Map(uint16(i+1), uint16((i/2)&0x7FFF))
212+
if !ok || s != uint16((i-1)/3*2+1) || p != 1 {
213213
t.Errorf("Expected %v, %v, got %v, %v, %v",
214-
uint16((i-1)/3*2 + 1), 1, ok, s, p)
214+
uint16((i-1)/3*2+1), 1, ok, s, p)
215215
}
216-
ok = m.Drop(uint16(i + 2), uint16((i/2) & 0x7FFF))
216+
ok = m.Drop(uint16(i+2), uint16((i/2)&0x7FFF))
217217
if !ok {
218218
t.Errorf("Expected ok")
219219
}
220220
}
221221

222-
ok, s, p = m.Map((256000 & 0xFFFF) + 4, 0)
223-
expect := uint16(((256000 - 1)/3*2 + 4) & 0xFFFF)
222+
ok, s, p = m.Map((256000&0xFFFF)+4, 0)
223+
expect := uint16(((256000-1)/3*2 + 4) & 0xFFFF)
224224
if !ok || s != expect || p != 1 {
225225
t.Errorf("Expected %v, 1, got %v, %v, %v", expect, ok, s, p)
226226
}

‎sdpfrag/sdpfrag.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ func getCandidates(as []sdp.Attribute, mid *string, index *uint16, ufrag string)
234234
continue
235235
}
236236
c := webrtc.ICECandidateInit{
237-
Candidate: a.Value,
238-
SDPMid: mid,
237+
Candidate: a.Value,
238+
SDPMid: mid,
239239
SDPMLineIndex: index,
240240
}
241241
if ufrag != "" {

‎sdpfrag/sdpfrag_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package sdpfrag
22

33
import (
4-
"testing"
54
"reflect"
5+
"testing"
66

77
"github.com/pion/sdp/v3"
88
)
@@ -238,7 +238,7 @@ func testRoundtrip(t *testing.T, sdpfrag string) {
238238
}
239239

240240
func TestRoundtrip(t *testing.T) {
241-
type test struct { name, frag string }
241+
type test struct{ name, frag string }
242242
for _, tt := range []test{
243243
{"sdpfragTrickle", sdpfragTrickle},
244244
{"sdpfragEndOfCandidates", sdpfragEndOfCandidates},

‎token/jwt.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func ParseKeys(keys []map[string]any, alg, kid string) ([]jwt.VerificationKey, e
100100
ks := make([]jwt.VerificationKey, 0, len(keys))
101101
for _, ky := range keys {
102102
// return all keys if alg and kid are not specified
103-
if alg != "" && ky["alg"] != alg {
103+
if alg != "" && ky["alg"] != alg {
104104
continue
105105
}
106106
if kid != "" && ky["kid"] != kid {

‎token/stateful_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func timeEqual(a, b *time.Time) bool {
1717
return true
1818
}
1919

20-
if a!= nil && b != nil {
20+
if a != nil && b != nil {
2121
return (*a).Equal(*b)
2222
}
2323

@@ -228,22 +228,22 @@ func TestTokenStorage(t *testing.T) {
228228
user2 := "user2"
229229
user3 := "user3"
230230
tokens := []*Stateful{
231-
&Stateful{
231+
{
232232
Token: "tok1",
233233
Group: "test",
234234
Username: &user1,
235235
Permissions: []string{"present", "message"},
236236
Expires: &future,
237237
},
238-
&Stateful{
238+
{
239239
Token: "tok2",
240240
Group: "test",
241241
Username: &user2,
242242
Permissions: []string{"present", "record", "message"},
243243
Expires: &nearFuture,
244244
NotBefore: &past,
245245
},
246-
&Stateful{
246+
{
247247
Token: "tok3",
248248
Group: "test",
249249
Username: &user3,
@@ -323,35 +323,35 @@ func TestExpire(t *testing.T) {
323323
user := "user"
324324

325325
tokens := []*Stateful{
326-
&Stateful{
326+
{
327327
Token: "tok1",
328328
Group: "test",
329329
Username: &user,
330330
Permissions: []string{"present", "message"},
331331
Expires: &now,
332332
},
333-
&Stateful{
333+
{
334334
Token: "tok2",
335335
Group: "test",
336336
Username: &user,
337337
Permissions: []string{"present", "message"},
338338
Expires: &future,
339339
},
340-
&Stateful{
340+
{
341341
Token: "tok3",
342342
Group: "test",
343343
Username: &user,
344344
Permissions: []string{"present", "message"},
345345
Expires: &now,
346346
},
347-
&Stateful{
347+
{
348348
Token: "tok4",
349349
Group: "test",
350350
Username: &user,
351351
Permissions: []string{"present", "message"},
352352
Expires: &past,
353353
},
354-
&Stateful{
354+
{
355355
Token: "tok5",
356356
Group: "test",
357357
Username: &user,

0 commit comments

Comments
 (0)