Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2026-01-03 16:55:31 -05:00
Code Issues Projects Releases Packages Wiki Activity

Improve code sequences with multiple errs

Browse source 
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
This commit is contained in:
Paul Meyer 2023-02-07 15:19:59 +01:00
parent 12c866bcb9
commit deea806d9c
9 changed files with 53 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hack/image-measurement/main.go
View file

@ -35,7 +35,7 @@ type libvirtInstance struct {
imagePath string
}
func (l *libvirtInstance) uploadBaseImage(baseVolume *libvirt.StorageVol) (err error) {
func (l *libvirtInstance) uploadBaseImage(baseVolume *libvirt.StorageVol) (retErr error) {
stream, err := l.conn.NewStream(libvirt.STREAM_NONBLOCK)
if err != nil {
return err
@ -46,7 +46,7 @@ func (l *libvirtInstance) uploadBaseImage(baseVolume *libvirt.StorageVol) (err e
return fmt.Errorf("error while opening %s: %s", l.imagePath, err)
}
defer func() {
err = errors.Join(err, file.Close())
retErr = errors.Join(err, file.Close())
}()
fi, err := file.Stat()
@ -282,7 +282,7 @@ func (l *libvirtInstance) deleteLibvirtInstance() error {
return err
}
func (l *libvirtInstance) obtainMeasurements() (measurements measurements.M, err error) {
func (l *libvirtInstance) obtainMeasurements() (measurements measurements.M, retErr error) {
// sanity check
if err := l.deleteLibvirtInstance(); err != nil {
return nil, err
@ -295,7 +295,7 @@ func (l *libvirtInstance) obtainMeasurements() (measurements measurements.M, err
}
}()
defer func() {
err = errors.Join(err, l.deleteLibvirtInstance())
retErr = errors.Join(retErr, l.deleteLibvirtInstance())
}()
if err := l.createLibvirtInstance(); err != nil {
return nil, err