Silence a few golint warnings.

This commit is contained in:
Sascha L. Teichmann 2015-05-27 18:13:39 +02:00
parent 9d1b0cc7c6
commit 1baf9f9dee

View File

@ -90,7 +90,7 @@ func MaxCoord(a, b Coord) Coord {
Z: maxComponent(a.Z, b.Z)} Z: maxComponent(a.Z, b.Z)}
} }
// Constructs a database key out of byte slice. // DecodeStringFromBytes constructs a database key out of byte slice.
func DecodeStringFromBytes(key []byte) (pos int64, err error) { func DecodeStringFromBytes(key []byte) (pos int64, err error) {
return strconv.ParseInt(string(key), 10, 64) return strconv.ParseInt(string(key), 10, 64)
} }
@ -99,7 +99,7 @@ func StringToBytes(key int64) []byte {
return []byte(strconv.FormatInt(key, 10)) return []byte(strconv.FormatInt(key, 10))
} }
// Encode a block pos to byte slice. // EncodeStringToBytes encodes a block pos to byte slice.
func EncodeStringToBytes(key int64) ([]byte, error) { func EncodeStringToBytes(key int64) ([]byte, error) {
return StringToBytes(key), nil return StringToBytes(key), nil
} }
@ -230,22 +230,22 @@ func IdentityTranscoder(key []byte) ([]byte, error) {
} }
func TranscodePlainToInterleaved(key []byte) ([]byte, error) { func TranscodePlainToInterleaved(key []byte) ([]byte, error) {
if pos, err := DecodeStringFromBytesToInterleaved(key); err != nil { pos, err := DecodeStringFromBytesToInterleaved(key)
if err != nil {
return nil, err return nil, err
} else {
return EncodeToBigEndian(pos)
} }
return EncodeToBigEndian(pos)
} }
func TranscodeInterleavedToPlain(key []byte) ([]byte, error) { func TranscodeInterleavedToPlain(key []byte) ([]byte, error) {
if pos, err := DecodeFromBigEndian(key); err != nil { pos, err := DecodeFromBigEndian(key)
if err != nil {
return nil, err return nil, err
} else {
return EncodeStringToBytes(TransformInterleavedToPlain(pos))
} }
return EncodeStringToBytes(TransformInterleavedToPlain(pos))
} }
// For correctness checks only. // NaiveBigMin is for correctness checks of BigMin only.
func NaiveBigMin(minz, maxz, zcode int64) int64 { func NaiveBigMin(minz, maxz, zcode int64) int64 {
var ( var (
c1 = InterleavedToCoord(minz) c1 = InterleavedToCoord(minz)