gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #1629 from lucas-clemente/remove-unused-uint

Browse Source 
remove unused ReadUint64 and WriteUint64 functions
This commit is contained in:
Marten Seemann
2018-11-26 17:52:27 +07:00
committed by GitHub
parent 42b74c7b87 6058f580be
commit dd81dfdbdd
3 changed files with 0 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
internal/utils/byteoder_big_endian_test.go
View File

@@ -43,23 +43,6 @@ var _ = Describe("Big Endian encoding / decoding", func() {
}) })
}) })
Context("ReadUint64", func() {
It("reads a big endian", func() {
b := []byte{0x12, 0x35, 0xAB, 0xFF, 0xEF, 0xBE, 0xAD, 0xDE}
val, err := BigEndian.ReadUint64(bytes.NewReader(b))
Expect(err).ToNot(HaveOccurred())
Expect(val).To(Equal(uint64(0x1235ABFFEFBEADDE)))
})
It("throws an error if less than 8 bytes are passed", func() {
b := []byte{0x12, 0x35, 0xAB, 0xFF, 0xEF, 0xBE, 0xAD, 0xDE}
for i := 0; i < len(b); i++ {
_, err := BigEndian.ReadUint64(bytes.NewReader(b[:i]))
Expect(err).To(MatchError(io.EOF))
}
})
})
Context("WriteUint16", func() { Context("WriteUint16", func() {
It("outputs 2 bytes", func() { It("outputs 2 bytes", func() {
b := &bytes.Buffer{} b := &bytes.Buffer{}
@@ -90,23 +73,7 @@ var _ = Describe("Big Endian encoding / decoding", func() {
}) })
}) })
Context("WriteUint64", func() {
It("outputs 8 bytes", func() {
b := &bytes.Buffer{}
BigEndian.WriteUint64(b, uint64(1))
Expect(b.Len()).To(Equal(8))
})
It("outputs a big endian", func() {
num := uint64(0xFFEEDDCCBBAA9988)
b := &bytes.Buffer{}
BigEndian.WriteUint64(b, num)
Expect(b.Bytes()).To(Equal([]byte{0xFF, 0xEE, 0xDD, 0xCC, 0xBB, 0xAA, 0x99, 0x88}))
})
})
Context("ReadUintN", func() { Context("ReadUintN", func() {
It("reads n bytes", func() { It("reads n bytes", func() {
m := map[uint8]uint64{ m := map[uint8]uint64{
0: 0x0, 0: 0x0,

2
internal/utils/byteorder.go
View File

@@ -8,11 +8,9 @@ import (
// A ByteOrder specifies how to convert byte sequences into 16-, 32-, or 64-bit unsigned integers. // A ByteOrder specifies how to convert byte sequences into 16-, 32-, or 64-bit unsigned integers.
type ByteOrder interface { type ByteOrder interface {
ReadUintN(b io.ByteReader, length uint8) (uint64, error) ReadUintN(b io.ByteReader, length uint8) (uint64, error)
ReadUint64(io.ByteReader) (uint64, error)
ReadUint32(io.ByteReader) (uint32, error) ReadUint32(io.ByteReader) (uint32, error)
ReadUint16(io.ByteReader) (uint16, error) ReadUint16(io.ByteReader) (uint16, error)
WriteUint64(*bytes.Buffer, uint64)
WriteUint32(*bytes.Buffer, uint32) WriteUint32(*bytes.Buffer, uint32)
WriteUint16(*bytes.Buffer, uint16) WriteUint16(*bytes.Buffer, uint16)
} }

39
internal/utils/byteorder_big_endian.go
View File

@@ -25,37 +25,6 @@ func (bigEndian) ReadUintN(b io.ByteReader, length uint8) (uint64, error) {
return res, nil return res, nil
} }
// ReadUint64 reads a uint64
func (bigEndian) ReadUint64(b io.ByteReader) (uint64, error) {
var b1, b2, b3, b4, b5, b6, b7, b8 uint8
var err error
if b8, err = b.ReadByte(); err != nil {
return 0, err
}
if b7, err = b.ReadByte(); err != nil {
return 0, err
}
if b6, err = b.ReadByte(); err != nil {
return 0, err
}
if b5, err = b.ReadByte(); err != nil {
return 0, err
}
if b4, err = b.ReadByte(); err != nil {
return 0, err
}
if b3, err = b.ReadByte(); err != nil {
return 0, err
}
if b2, err = b.ReadByte(); err != nil {
return 0, err
}
if b1, err = b.ReadByte(); err != nil {
return 0, err
}
return uint64(b1) + uint64(b2)<<8 + uint64(b3)<<16 + uint64(b4)<<24 + uint64(b5)<<32 + uint64(b6)<<40 + uint64(b7)<<48 + uint64(b8)<<56, nil
}
// ReadUint32 reads a uint32 // ReadUint32 reads a uint32
func (bigEndian) ReadUint32(b io.ByteReader) (uint32, error) { func (bigEndian) ReadUint32(b io.ByteReader) (uint32, error) {
var b1, b2, b3, b4 uint8 var b1, b2, b3, b4 uint8
@@ -88,14 +57,6 @@ func (bigEndian) ReadUint16(b io.ByteReader) (uint16, error) {
return uint16(b1) + uint16(b2)<<8, nil return uint16(b1) + uint16(b2)<<8, nil
} }
// WriteUint64 writes a uint64
func (bigEndian) WriteUint64(b *bytes.Buffer, i uint64) {
b.Write([]byte{
uint8(i >> 56), uint8(i >> 48), uint8(i >> 40), uint8(i >> 32),
uint8(i >> 24), uint8(i >> 16), uint8(i >> 8), uint8(i),
})
}
// WriteUint32 writes a uint32 // WriteUint32 writes a uint32
func (bigEndian) WriteUint32(b *bytes.Buffer, i uint32) { func (bigEndian) WriteUint32(b *bytes.Buffer, i uint32) {
b.Write([]byte{uint8(i >> 24), uint8(i >> 16), uint8(i >> 8), uint8(i)}) b.Write([]byte{uint8(i >> 24), uint8(i >> 16), uint8(i >> 8), uint8(i)})