p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up: remove redundant value assign in runconfig/parse.go

Browse Source 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5575b9367832b22a3103b697a2ef8ffaf0b95944
Component: engine
This commit is contained in:
Lei Jitang
2015-09-14 08:30:11 -04:00
parent 357f37d8f7
commit 43cb20e54c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/engine/runconfig/parse.go
View File

@ -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