We are using err in defer function, needs to be defined name

Since we are checking if err is non nil in defer function we need
to define it, so that the check will work correctly.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #985
Approved by: mheon

3 files changed, 3 insertions, 3 deletions

diff --git a/libpod/container_api.go b/libpod/container_api.go
index 96648ccf5..7613c8ea5 100644
--- a/libpod/container_api.go
+++ b/libpod/container_api.go
@@ -701,7 +701,7 @@ func (c *Container) Sync() error {
 }
 
 // RestartWithTimeout restarts a running container and takes a given timeout in uint
-func (c *Container) RestartWithTimeout(ctx context.Context, timeout uint) error {
+func (c *Container) RestartWithTimeout(ctx context.Context, timeout uint) (err error) {
 	if !c.batched {
 		c.lock.Lock()
 		defer c.lock.Unlock()
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 2584c091d..46d5a95ee 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -294,7 +294,7 @@ func NewRuntimeFromConfig(configPath string, options ...RuntimeOption) (runtime
 
 // Make a new runtime based on the given configuration
 // Sets up containers/storage, state store, OCI runtime
-func makeRuntime(runtime *Runtime) error {
+func makeRuntime(runtime *Runtime) (err error) {
 	// Find a working OCI runtime binary
 	foundRuntime := false
 	for _, path := range runtime.config.RuntimePath {
diff --git a/libpod/storage.go b/libpod/storage.go
index c5581d53c..b969df7f3 100644
--- a/libpod/storage.go
+++ b/libpod/storage.go
@@ -59,7 +59,7 @@ func (metadata *RuntimeContainerMetadata) SetMountLabel(mountLabel string) {
 
 // CreateContainerStorage creates the storage end of things.  We already have the container spec created
 // TO-DO We should be passing in an Image object in the future.
-func (r *storageService) CreateContainerStorage(ctx context.Context, systemContext *types.SystemContext, imageName, imageID, containerName, containerID, mountLabel string, options *storage.ContainerOptions) (ContainerInfo, error) {
+func (r *storageService) CreateContainerStorage(ctx context.Context, systemContext *types.SystemContext, imageName, imageID, containerName, containerID, mountLabel string, options *storage.ContainerOptions) (cinfo ContainerInfo, err error) {
 	var imageConfig *v1.Image
 	if imageName != "" {
 		var ref types.ImageReference