Skip to content

Fixed for go1.0.1 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adulau wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed for go1.0.1 #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions uuid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ package uuid

import "crypto/rand"
import "fmt"
import "json"
import "os"
import "strings"
import "encoding/json"

// A universally unique identifier.
type UUID [16]byte
Expand All @@ -27,7 +26,7 @@ func NewV4()(u *UUID){

// Constructs a new V4 (random) UUID. Error is returned
// iff there is an error reading from the random source.
func V4()(u *UUID, err os.Error){
func V4()(u *UUID, err error){
u = new(UUID)
_, err = rand.Read(u[0:16])
if err != nil { return }
Expand All @@ -45,20 +44,20 @@ func (u UUID)String()(string){

// Marshal a UUID to a UUID string so as to
// avoid byte-format marshalling.
func (u *UUID)MarshalJSON()(buff []byte, err os.Error){
func (u *UUID)MarshalJSON()(buff []byte, err error){
return json.Marshal(u.String())
}

// Parse an UUID string from JSON.
func (u *UUID)UnmarshalJSON(buff []byte)(err os.Error){
func (u *UUID)UnmarshalJSON(buff []byte)(err error){
ustr := ""
err = json.Unmarshal(buff, &ustr)
if err == nil { err = u.parse(ustr) }
return
}

// Parse an UUID string and return a new object.
func Parse(s string)(u *UUID, err os.Error){
func Parse(s string)(u *UUID, err error){
u = new(UUID)
u.parse(s)
return
Expand Down Expand Up @@ -102,7 +101,7 @@ func hexValue(c byte)(byte){
return 0xff
}

func (u *UUID)parse(s string)(err os.Error){
func (u *UUID)parse(s string)(err error){
if u == nil { u = new(UUID)}
//fmt.Printf("UUID Unmarshal: [%s]\n", s)
blks := strings.SplitN(s, "-", 5)
Expand All @@ -120,3 +119,4 @@ func (u *UUID)parse(s string)(err os.Error){
//fmt.Printf("UUID Unmarshaled: [%s]\n", u.String())
return
}