diff options
author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-02-17 20:46:30 +0800 |
---|---|---|
committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-02-17 20:46:30 +0800 |
commit | aa36a6ae4f24f07e2c470a21c93ff37ad5861982 (patch) | |
tree | dba654e20554d28383c1f3bb8164fa9f5849d1bd /Godeps/_workspace/src/github.com/pborman/uuid/uuid.go | |
parent | 4f28c5b69d652e12adf8a88f526f459a492e159e (diff) | |
parent | 6ba7bbbe29029c8bf2bf75f8ebcbd3847eafa401 (diff) | |
download | go-tangerine-aa36a6ae4f24f07e2c470a21c93ff37ad5861982.tar go-tangerine-aa36a6ae4f24f07e2c470a21c93ff37ad5861982.tar.gz go-tangerine-aa36a6ae4f24f07e2c470a21c93ff37ad5861982.tar.bz2 go-tangerine-aa36a6ae4f24f07e2c470a21c93ff37ad5861982.tar.lz go-tangerine-aa36a6ae4f24f07e2c470a21c93ff37ad5861982.tar.xz go-tangerine-aa36a6ae4f24f07e2c470a21c93ff37ad5861982.tar.zst go-tangerine-aa36a6ae4f24f07e2c470a21c93ff37ad5861982.zip |
Merge pull request #2206 from fjl/update-deps
Godeps: update all dependencies
Diffstat (limited to 'Godeps/_workspace/src/github.com/pborman/uuid/uuid.go')
-rw-r--r-- | Godeps/_workspace/src/github.com/pborman/uuid/uuid.go | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/uuid.go b/Godeps/_workspace/src/github.com/pborman/uuid/uuid.go index 2920fae63..c4482cd87 100644 --- a/Godeps/_workspace/src/github.com/pborman/uuid/uuid.go +++ b/Godeps/_workspace/src/github.com/pborman/uuid/uuid.go @@ -7,6 +7,7 @@ package uuid import ( "bytes" "crypto/rand" + "encoding/hex" "fmt" "io" "strings" @@ -54,8 +55,8 @@ func Parse(s string) UUID { if s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-' { return nil } - uuid := make([]byte, 16) - for i, x := range []int{ + var uuid [16]byte + for i, x := range [16]int{ 0, 2, 4, 6, 9, 11, 14, 16, @@ -67,7 +68,7 @@ func Parse(s string) UUID { uuid[i] = v } } - return uuid + return uuid[:] } // Equal returns true if uuid1 and uuid2 are equal. @@ -78,23 +79,36 @@ func Equal(uuid1, uuid2 UUID) bool { // String returns the string form of uuid, xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx // , or "" if uuid is invalid. func (uuid UUID) String() string { - if uuid == nil || len(uuid) != 16 { + if len(uuid) != 16 { return "" } - b := []byte(uuid) - return fmt.Sprintf("%08x-%04x-%04x-%04x-%012x", - b[:4], b[4:6], b[6:8], b[8:10], b[10:]) + var buf [36]byte + encodeHex(buf[:], uuid) + return string(buf[:]) } // URN returns the RFC 2141 URN form of uuid, // urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx, or "" if uuid is invalid. func (uuid UUID) URN() string { - if uuid == nil || len(uuid) != 16 { + if len(uuid) != 16 { return "" } - b := []byte(uuid) - return fmt.Sprintf("urn:uuid:%08x-%04x-%04x-%04x-%012x", - b[:4], b[4:6], b[6:8], b[8:10], b[10:]) + var buf [36 + 9]byte + copy(buf[:], "urn:uuid:") + encodeHex(buf[9:], uuid) + return string(buf[:]) +} + +func encodeHex(dst []byte, uuid UUID) { + hex.Encode(dst[:], uuid[:4]) + dst[8] = '-' + hex.Encode(dst[9:13], uuid[4:6]) + dst[13] = '-' + hex.Encode(dst[14:18], uuid[6:8]) + dst[18] = '-' + hex.Encode(dst[19:23], uuid[8:10]) + dst[23] = '-' + hex.Encode(dst[24:], uuid[10:]) } // Variant returns the variant encoded in uuid. It returns Invalid if @@ -113,10 +127,9 @@ func (uuid UUID) Variant() Variant { default: return Reserved } - panic("unreachable") } -// Version returns the verison of uuid. It returns false if uuid is not +// Version returns the version of uuid. It returns false if uuid is not // valid. func (uuid UUID) Version() (Version, bool) { if len(uuid) != 16 { |