From 43cb20e54c4797537e97ca3ca48793dcdd885e6d Mon Sep 17 00:00:00 2001 From: Lei Jitang Date: Mon, 14 Sep 2015 08:30:11 -0400 Subject: [PATCH] Clean up: remove redundant value assign in runconfig/parse.go Signed-off-by: Lei Jitang Upstream-commit: 5575b9367832b22a3103b697a2ef8ffaf0b95944 Component: engine --- components/engine/runconfig/parse.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/components/engine/runconfig/parse.go b/components/engine/runconfig/parse.go index 079dff728e..f36244f07b 100644 --- a/components/engine/runconfig/parse.go +++ b/components/engine/runconfig/parse.go @@ -148,13 +148,14 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe attachStderr = true } + var err error + var flMemory int64 if *flMemoryString != "" { - parsedMemory, err := units.RAMInBytes(*flMemoryString) + flMemory, err = units.RAMInBytes(*flMemoryString) if err != nil { return nil, nil, cmd, err } - flMemory = parsedMemory } var memorySwap int64 @@ -162,21 +163,19 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe if *flMemorySwap == "-1" { memorySwap = -1 } else { - parsedMemorySwap, err := units.RAMInBytes(*flMemorySwap) + memorySwap, err = units.RAMInBytes(*flMemorySwap) if err != nil { return nil, nil, cmd, err } - memorySwap = parsedMemorySwap } } var KernelMemory int64 if *flKernelMemory != "" { - parsedKernelMemory, err := units.RAMInBytes(*flKernelMemory) + KernelMemory, err = units.RAMInBytes(*flKernelMemory) if err != nil { return nil, nil, cmd, err } - KernelMemory = parsedKernelMemory } swappiness := *flSwappiness