From ebf8547c38756fa51f95dcac110d8008019bef01 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Sun, 9 Dec 2018 12:35:07 +0100
Subject: [PATCH] virtcontainers: Remove useless startSandbox wrapper

startSandbox() wraps a single operation (sandbox.Start()), so we can
remove it and make the code easier to read/follow.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---
 virtcontainers/api.go | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/virtcontainers/api.go b/virtcontainers/api.go
index c5162488c..d0de395be 100644
--- a/virtcontainers/api.go
+++ b/virtcontainers/api.go
@@ -234,12 +234,8 @@ func StartSandbox(ctx context.Context, sandboxID string) (VCSandbox, error) {
 	}
 	defer s.releaseStatelessSandbox()
 
-	return startSandbox(s)
-}
-
-func startSandbox(s *Sandbox) (*Sandbox, error) {
 	// Start it
-	err := s.Start()
+	err = s.Start()
 	if err != nil {
 		return nil, err
 	}
@@ -285,6 +281,7 @@ func RunSandbox(ctx context.Context, sandboxConfig SandboxConfig, factory Factor
 	span, ctx := trace(ctx, "RunSandbox")
 	defer span.Finish()
 
+	// Create the sandbox
 	s, err := createSandboxFromConfig(ctx, sandboxConfig, factory)
 	if err != nil {
 		return nil, err
@@ -297,7 +294,13 @@ func RunSandbox(ctx context.Context, sandboxConfig SandboxConfig, factory Factor
 	}
 	defer unlockSandbox(lockFile)
 
-	return startSandbox(s)
+	// Start the sandbox
+	err = s.Start()
+	if err != nil {
+		return nil, err
+	}
+
+	return s, nil
 }
 
 // ListSandbox is the virtcontainers sandbox listing entry point.