aboutsummaryrefslogtreecommitdiff
path: root/weed/util/bytes.go
diff options
context:
space:
mode:
Diffstat (limited to 'weed/util/bytes.go')
-rw-r--r--weed/util/bytes.go33
1 files changed, 27 insertions, 6 deletions
diff --git a/weed/util/bytes.go b/weed/util/bytes.go
index dfa4ae665..68279cefc 100644
--- a/weed/util/bytes.go
+++ b/weed/util/bytes.go
@@ -1,8 +1,10 @@
package util
+import "encoding/binary"
+
// big endian
-func BytesToUint64(b []byte) (v uint64) {
+func BytesToUint64Old(b []byte) (v uint64) {
length := uint(len(b))
for i := uint(0); i < length-1; i++ {
v += uint64(b[i])
@@ -11,7 +13,7 @@ func BytesToUint64(b []byte) (v uint64) {
v += uint64(b[length-1])
return
}
-func BytesToUint32(b []byte) (v uint32) {
+func BytesToUint32Old(b []byte) (v uint32) {
length := uint(len(b))
for i := uint(0); i < length-1; i++ {
v += uint32(b[i])
@@ -20,26 +22,45 @@ func BytesToUint32(b []byte) (v uint32) {
v += uint32(b[length-1])
return
}
-func BytesToUint16(b []byte) (v uint16) {
+func BytesToUint16Old(b []byte) (v uint16) {
v += uint16(b[0])
v <<= 8
v += uint16(b[1])
return
}
-func Uint64toBytes(b []byte, v uint64) {
+func Uint64toBytesOld(b []byte, v uint64) {
for i := uint(0); i < 8; i++ {
b[7-i] = byte(v >> (i * 8))
}
}
-func Uint32toBytes(b []byte, v uint32) {
+func Uint32toBytesOld(b []byte, v uint32) {
for i := uint(0); i < 4; i++ {
b[3-i] = byte(v >> (i * 8))
}
}
-func Uint16toBytes(b []byte, v uint16) {
+func Uint16toBytesOld(b []byte, v uint16) {
b[0] = byte(v >> 8)
b[1] = byte(v)
}
+
+func BytesToUint64(b []byte) (v uint64) {
+ return binary.BigEndian.Uint64(b)
+}
+func BytesToUint32(b []byte) (v uint32) {
+ return binary.BigEndian.Uint32(b)
+}
+func BytesToUint16(b []byte) (v uint16) {
+ return binary.BigEndian.Uint16(b)
+}
+func Uint64toBytes(b []byte, v uint64) {
+ binary.BigEndian.PutUint64(b, v)
+}
+func Uint32toBytes(b []byte, v uint32) {
+ binary.BigEndian.PutUint32(b, v)
+}
+func Uint16toBytes(b []byte, v uint16) {
+ binary.BigEndian.PutUint16(b, v)
+}
func Uint8toBytes(b []byte, v uint8) {
b[0] = byte(v)
}