kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Use make instead of new

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-05-08 10:35:41 -07:00
parent 7b1ec9ff30
commit c4ebf870c8
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
image.go
View file

@ -267,13 +267,13 @@ func (img *Image) Checksum() (string, error) {
} }
checksumDictPth := path.Join(root, "..", "..", "checksums") checksumDictPth := path.Join(root, "..", "..", "checksums")
checksums := new(map[string]string) checksums := make(map[string]string)
if checksumDict, err := ioutil.ReadFile(checksumDictPth); err == nil { if checksumDict, err := ioutil.ReadFile(checksumDictPth); err == nil {
if err := json.Unmarshal(checksumDict, checksums); err != nil { if err := json.Unmarshal(checksumDict, checksums); err != nil {
return "", err return "", err
} }
if checksum, ok := (*checksums)[img.Id]; ok { if checksum, ok := checksums[img.Id]; ok {
return checksum, nil return checksum, nil
} }
} }
@ -304,10 +304,8 @@ func (img *Image) Checksum() (string, error) {
} }
hash := "sha256:" + hex.EncodeToString(h.Sum(nil)) hash := "sha256:" + hex.EncodeToString(h.Sum(nil))
if *checksums == nil { checksums[img.Id] = hash
*checksums = map[string]string{}
}
(*checksums)[img.Id] = hash
checksumJson, err := json.Marshal(checksums) checksumJson, err := json.Marshal(checksums)
if err != nil { if err != nil {
return hash, err return hash, err