kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #16279 from coolljt0725/clean_up

Browse source 
Clean up: remove redundant value assign in runconfig/parse.go
This commit is contained in:
Antonio Murdaca 2015-09-15 11:43:38 +02:00
commit 0d873f6e70
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
runconfig/parse.go
View file

@ -148,13 +148,14 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe
attachStderr = true attachStderr = true
} }
var err error
var flMemory int64 var flMemory int64
if *flMemoryString != "" { if *flMemoryString != "" {
parsedMemory, err := units.RAMInBytes(*flMemoryString) flMemory, err = units.RAMInBytes(*flMemoryString)
if err != nil { if err != nil {
return nil, nil, cmd, err return nil, nil, cmd, err
} }
flMemory = parsedMemory
} }
var memorySwap int64 var memorySwap int64
@ -162,21 +163,19 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe
if *flMemorySwap == "-1" { if *flMemorySwap == "-1" {
memorySwap = -1 memorySwap = -1
} else { } else {
parsedMemorySwap, err := units.RAMInBytes(*flMemorySwap) memorySwap, err = units.RAMInBytes(*flMemorySwap)
if err != nil { if err != nil {
return nil, nil, cmd, err return nil, nil, cmd, err
} }
memorySwap = parsedMemorySwap
} }
} }
var KernelMemory int64 var KernelMemory int64
if *flKernelMemory != "" { if *flKernelMemory != "" {
parsedKernelMemory, err := units.RAMInBytes(*flKernelMemory) KernelMemory, err = units.RAMInBytes(*flKernelMemory)
if err != nil { if err != nil {
return nil, nil, cmd, err return nil, nil, cmd, err
} }
KernelMemory = parsedKernelMemory
} }
swappiness := *flSwappiness swappiness := *flSwappiness