jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #355 from keloyang/nake 

Remove naked return
This commit is contained in:
Alexander Morozov 2015-10-25 19:50:41 -07:00
parent 6c36d666a1 4584a4e762
commit db21ac7750
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spec.go
View File

@ -299,7 +299,7 @@ func loadSpec(cPath, rPath string) (spec *specs.LinuxSpec, rspec *specs.LinuxRun
if os.IsNotExist(err) { if os.IsNotExist(err) {
return nil, nil, fmt.Errorf("JSON specification file at %s not found", cPath) return nil, nil, fmt.Errorf("JSON specification file at %s not found", cPath)
} }
return return spec, rspec, err
} }
defer cf.Close() defer cf.Close()
@ -308,15 +308,15 @@ func loadSpec(cPath, rPath string) (spec *specs.LinuxSpec, rspec *specs.LinuxRun
if os.IsNotExist(err) { if os.IsNotExist(err) {
return nil, nil, fmt.Errorf("JSON runtime config file at %s not found", rPath) return nil, nil, fmt.Errorf("JSON runtime config file at %s not found", rPath)
} }
return return spec, rspec, err
} }
defer rf.Close() defer rf.Close()
if err = json.NewDecoder(cf).Decode(&spec); err != nil { if err = json.NewDecoder(cf).Decode(&spec); err != nil {
return return spec, rspec, err
} }
if err = json.NewDecoder(rf).Decode(&rspec); err != nil { if err = json.NewDecoder(rf).Decode(&rspec); err != nil {
return return spec, rspec, err
} }
return spec, rspec, checkSpecVersion(spec) return spec, rspec, checkSpecVersion(spec)
} }