Fix further style issues

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #268
Approved by: rhatdan

2 files changed, 3 insertions, 6 deletions

diff --git a/libpod/sql_state.go b/libpod/sql_state.go
index ff04d6d63..f67969cf7 100644
--- a/libpod/sql_state.go
+++ b/libpod/sql_state.go
@@ -920,13 +920,11 @@ func (s *SQLState) RemovePodContainers(pod *Pod) (err error) {
 	// Remove state first, as it needs the subquery on containers
 	// Don't bother checking if we actually removed anything, we just want to
 	// empty the pod
-	_, err = tx.Exec(removeCtrState, pod.ID())
-	if err != nil {
+	if _, err := tx.Exec(removeCtrState, pod.ID()); err != nil {
 		return errors.Wrapf(err, "error removing pod %s containers from state table", pod.ID())
 	}
 
-	_, err = tx.Exec(removeCtr, pod.ID())
-	if err != nil {
+	if _, err := tx.Exec(removeCtr, pod.ID()); err != nil {
 		return errors.Wrapf(err, "error removing pod %s containers from containers table", pod.ID())
 	}
 
diff --git a/libpod/sql_state_internal.go b/libpod/sql_state_internal.go
index 5bc2d84f5..5e18b7cfd 100644
--- a/libpod/sql_state_internal.go
+++ b/libpod/sql_state_internal.go
@@ -672,8 +672,7 @@ func (s *SQLState) ctrFromScannable(row scannable) (*Container, error) {
 	// Retrieve the ports from disk
 	// They may not exist - if they don't, this container just doesn't have ports
 	portPath := getPortsPath(s.specsDir, id)
-	_, err = os.Stat(portPath)
-	if err != nil {
+	if _, err = os.Stat(portPath); err != nil {
 		if !os.IsNotExist(err) {
 			return nil, errors.Wrapf(err, "error stating container %s JSON ports", id)
 		}