Remove redundant error checks

dvrkps · dvrkps · commit cfc36388b3ed · 2019-04-30T21:28:51.000+02:00
Signed-off-by: Davor Kapsa &lt;davor.kapsa@gmail.com&gt;
diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go
@@ -427,10 +427,6 @@ var restoreCommand = cli.Command{
 			return err
 		}
 
-		if err := task.Start(ctx); err != nil {
-			return err
-		}
-
-		return nil
+		return task.Start(ctx)
 	},
 }
diff --git a/images/archive/importer.go b/images/archive/importer.go
@@ -197,10 +197,7 @@ func onUntarJSON(r io.Reader, j interface{}) error {
 	if err != nil {
 		return err
 	}
-	if err := json.Unmarshal(b, j); err != nil {
-		return err
-	}
-	return nil
+	return json.Unmarshal(b, j)
 }
 
 func onUntarBlob(ctx context.Context, r io.Reader, store content.Ingester, size int64, ref string) (digest.Digest, error) {
diff --git a/metadata/content.go b/metadata/content.go
@@ -767,11 +767,7 @@ func writeExpireAt(expire time.Time, bkt *bolt.Bucket) error {
 	if err != nil {
 		return err
 	}
-	if err := bkt.Put(bucketKeyExpireAt, expireAt); err != nil {
-		return err
-	}
-
-	return nil
+	return bkt.Put(bucketKeyExpireAt, expireAt)
 }
 
 func (cs *contentStore) garbageCollect(ctx context.Context) (d time.Duration, err error) {
diff --git a/services/server/server.go b/services/server/server.go
@@ -67,10 +67,8 @@ func CreateTopLevelDirectories(config *srvconfig.Config) error {
 	if err := sys.MkdirAllWithACL(config.Root, 0711); err != nil {
 		return err
 	}
-	if err := sys.MkdirAllWithACL(config.State, 0711); err != nil {
-		return err
-	}
-	return nil
+
+	return sys.MkdirAllWithACL(config.State, 0711)
 }
 
 // New creates and initializes a new containerd server
diff --git a/snapshots/devmapper/metadata.go b/snapshots/devmapper/metadata.go
@@ -241,11 +241,7 @@ func (m *PoolMetadata) RemoveDevice(ctx context.Context, name string) error {
 			return errors.Wrapf(err, "failed to delete device info for %q", name)
 		}
 
-		if err := markDeviceID(tx, device.DeviceID, deviceFree); err != nil {
-			return err
-		}
-
-		return nil
+		return markDeviceID(tx, device.DeviceID, deviceFree)
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -427,10 +427,6 @@ var restoreCommand = cli.Command{`
`427`	`427`	`return err`
`428`	`428`	`}`
`429`	`429`
`430`		`- if err := task.Start(ctx); err != nil {`
`431`		`- return err`
`432`		`- }`
`433`		`-`
`434`		`- return nil`
	`430`	`+ return task.Start(ctx)`
`435`	`431`	`},`
`436`	`432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,10 +197,7 @@ func onUntarJSON(r io.Reader, j interface{}) error {`
`197`	`197`	`if err != nil {`
`198`	`198`	`return err`
`199`	`199`	`}`
`200`		`- if err := json.Unmarshal(b, j); err != nil {`
`201`		`- return err`
`202`		`- }`
`203`		`- return nil`
	`200`	`+ return json.Unmarshal(b, j)`
`204`	`201`	`}`
`205`	`202`
`206`	`203`	`func onUntarBlob(ctx context.Context, r io.Reader, store content.Ingester, size int64, ref string) (digest.Digest, error) {`
Original file line number	Diff line number	Diff line change
`@@ -767,11 +767,7 @@ func writeExpireAt(expire time.Time, bkt *bolt.Bucket) error {`
`767`	`767`	`if err != nil {`
`768`	`768`	`return err`
`769`	`769`	`}`
`770`		`- if err := bkt.Put(bucketKeyExpireAt, expireAt); err != nil {`
`771`		`- return err`
`772`		`- }`
`773`		`-`
`774`		`- return nil`
	`770`	`+ return bkt.Put(bucketKeyExpireAt, expireAt)`
`775`	`771`	`}`
`776`	`772`
`777`	`773`	`func (cs *contentStore) garbageCollect(ctx context.Context) (d time.Duration, err error) {`
Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,8 @@ func CreateTopLevelDirectories(config *srvconfig.Config) error {`
`67`	`67`	`if err := sys.MkdirAllWithACL(config.Root, 0711); err != nil {`
`68`	`68`	`return err`
`69`	`69`	`}`
`70`		`- if err := sys.MkdirAllWithACL(config.State, 0711); err != nil {`
`71`		`- return err`
`72`		`- }`
`73`		`- return nil`
	`70`	`+`
	`71`	`+ return sys.MkdirAllWithACL(config.State, 0711)`
`74`	`72`	`}`
`75`	`73`
`76`	`74`	`// New creates and initializes a new containerd server`
Original file line number	Diff line number	Diff line change
`@@ -241,11 +241,7 @@ func (m *PoolMetadata) RemoveDevice(ctx context.Context, name string) error {`
`241`	`241`	`return errors.Wrapf(err, "failed to delete device info for %q", name)`
`242`	`242`	`}`
`243`	`243`
`244`		`- if err := markDeviceID(tx, device.DeviceID, deviceFree); err != nil {`
`245`		`- return err`
`246`		`- }`
`247`		`-`
`248`		`- return nil`
	`244`	`+ return markDeviceID(tx, device.DeviceID, deviceFree)`
`249`	`245`	`})`
`250`	`246`	`}`
`251`	`247`