Skip to content

Commit 35d471a

Browse files
authored
Revert "use std encoding lib"
1 parent fa160e0 commit 35d471a

File tree

3 files changed

+6
-90
lines changed

3 files changed

+6
-90
lines changed

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ require (
1212
github.com/disintegration/imaging v1.6.0
1313
github.com/dustin/go-humanize v1.0.0
1414
github.com/gabriel-vasile/mimetype v0.3.15
15-
github.com/go-logfmt/logfmt v0.4.0 // indirect
1615
github.com/go-redis/redis v6.15.2+incompatible
1716
github.com/go-sql-driver/mysql v1.4.1
1817
github.com/gocql/gocql v0.0.0-20190717234527-2ba2dd7440dc

weed/util/bytes.go

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package util
22

3-
import "encoding/binary"
4-
53
// big endian
64

7-
func BytesToUint64Old(b []byte) (v uint64) {
5+
func BytesToUint64(b []byte) (v uint64) {
86
length := uint(len(b))
97
for i := uint(0); i < length-1; i++ {
108
v += uint64(b[i])
@@ -13,7 +11,7 @@ func BytesToUint64Old(b []byte) (v uint64) {
1311
v += uint64(b[length-1])
1412
return
1513
}
16-
func BytesToUint32Old(b []byte) (v uint32) {
14+
func BytesToUint32(b []byte) (v uint32) {
1715
length := uint(len(b))
1816
for i := uint(0); i < length-1; i++ {
1917
v += uint32(b[i])
@@ -22,45 +20,26 @@ func BytesToUint32Old(b []byte) (v uint32) {
2220
v += uint32(b[length-1])
2321
return
2422
}
25-
func BytesToUint16Old(b []byte) (v uint16) {
23+
func BytesToUint16(b []byte) (v uint16) {
2624
v += uint16(b[0])
2725
v <<= 8
2826
v += uint16(b[1])
2927
return
3028
}
31-
func Uint64toBytesOld(b []byte, v uint64) {
29+
func Uint64toBytes(b []byte, v uint64) {
3230
for i := uint(0); i < 8; i++ {
3331
b[7-i] = byte(v >> (i * 8))
3432
}
3533
}
36-
func Uint32toBytesOld(b []byte, v uint32) {
34+
func Uint32toBytes(b []byte, v uint32) {
3735
for i := uint(0); i < 4; i++ {
3836
b[3-i] = byte(v >> (i * 8))
3937
}
4038
}
41-
func Uint16toBytesOld(b []byte, v uint16) {
39+
func Uint16toBytes(b []byte, v uint16) {
4240
b[0] = byte(v >> 8)
4341
b[1] = byte(v)
4442
}
45-
46-
func BytesToUint64(b []byte) (v uint64) {
47-
return binary.BigEndian.Uint64(b)
48-
}
49-
func BytesToUint32(b []byte) (v uint32) {
50-
return binary.BigEndian.Uint32(b)
51-
}
52-
func BytesToUint16(b []byte) (v uint16) {
53-
return binary.BigEndian.Uint16(b)
54-
}
55-
func Uint64toBytes(b []byte, v uint64) {
56-
binary.BigEndian.PutUint64(b, v)
57-
}
58-
func Uint32toBytes(b []byte, v uint32) {
59-
binary.BigEndian.PutUint32(b, v)
60-
}
61-
func Uint16toBytes(b []byte, v uint16) {
62-
binary.BigEndian.PutUint16(b, v)
63-
}
6443
func Uint8toBytes(b []byte, v uint8) {
6544
b[0] = byte(v)
6645
}

weed/util/bytes_test.go

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)