Skip to content

Commit bfd4a34

Browse files
committed
chore: make lint happy
1 parent eb18b67 commit bfd4a34

File tree

1 file changed

+1
-32
lines changed

1 file changed

+1
-32
lines changed

utils/binary/builder.go

+1-32
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"io"
77
"math"
88
"net"
9-
"runtime"
109
"strconv"
1110
"unsafe"
1211

@@ -20,28 +19,19 @@ type Builder struct {
2019
key ftea.TEA
2120
usetea bool
2221
hasput bool
23-
hasset bool
2422
io.Writer
2523
io.ReaderFrom
2624
}
2725

2826
// NewWriterF from https://github.com/Mrs4s/MiraiGo/blob/master/binary/writer.go
2927
func NewWriterF(f func(writer *Builder)) []byte {
30-
w := SelectBuilder(nil)
28+
w := NewBuilder()
3129
f(w)
3230
b := make([]byte, w.Len())
3331
copy(b, w.ToBytes())
34-
w.put()
3532
return b
3633
}
3734

38-
// OpenWriterF must call func cl to close from https://github.com/Mrs4s/MiraiGo/blob/master/binary/writer.go
39-
func OpenWriterF(f func(builder *Builder)) (b []byte, cl func()) {
40-
w := SelectBuilder(nil)
41-
f(w)
42-
return w.ToBytes(), w.put
43-
}
44-
4535
// ToBytes from https://github.com/Mrs4s/MiraiGo/blob/master/binary/writer.go
4636
func ToBytes(i any) []byte {
4737
return NewWriterF(func(w *Builder) {
@@ -55,31 +45,13 @@ func ToBytes(i any) []byte {
5545
})
5646
}
5747

58-
// NewBuilder with finalizer of itself.
59-
//
60-
// Be sure to use all data before builder is GCed.
61-
func NewBuilder(key []byte) *Builder {
62-
b := SelectBuilder(key)
63-
if !b.hasset {
64-
b.hasset = true
65-
runtime.SetFinalizer(b, func(b any) {
66-
b.(*Builder).put()
67-
})
68-
}
69-
return b
70-
}
71-
7248
func (b *Builder) init(key []byte) *Builder {
7349
b.key = ftea.NewTeaCipher(key)
7450
b.usetea = len(key) == 16
7551
b.hasput = false
7652
return b
7753
}
7854

79-
func (b *Builder) put() {
80-
PutBuilder(b)
81-
}
82-
8355
func (b *Builder) Len() int {
8456
return b.buffer.Len()
8557
}
@@ -99,7 +71,6 @@ func (b *Builder) Buffer() *bytes.Buffer {
9971
// GC 安全, 返回的数据在 Builder 被销毁之后仍能被正确读取,
10072
// 但是只能调用一次, 调用后 Builder 即失效
10173
func (b *Builder) ToBytes() []byte {
102-
defer b.put()
10374
if b.usetea {
10475
return b.key.Encrypt(b.buffer.Bytes())
10576
}
@@ -113,8 +84,6 @@ func (b *Builder) ToBytes() []byte {
11384
// GC 安全, 返回的数据在 Builder 被销毁之后仍能被正确读取,
11485
// 但是只能调用一次, 调用后 Builder 即失效
11586
func (b *Builder) Pack(typ uint16) []byte {
116-
defer b.put()
117-
11887
buf := make([]byte, b.Len()+2+2+16)
11988

12089
n := 0

0 commit comments

Comments
 (0)