kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

clean some redundant else clauses 

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
This commit is contained in:
Zhang Wei 2015-05-19 10:54:04 +08:00
parent 472538bee0
commit d91ae65280
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/client/help.go
View File

@ -23,10 +23,9 @@ func (cli *DockerCli) CmdHelp(args ...string) error {
method, exists := cli.getMethod(args[0]) method, exists := cli.getMethod(args[0])
if !exists { if !exists {
return fmt.Errorf("docker: '%s' is not a docker command. See 'docker --help'.", args[0]) return fmt.Errorf("docker: '%s' is not a docker command. See 'docker --help'.", args[0])
} else {
method("--help")
return nil
} }
method("--help")
return nil
} }
flag.Usage() flag.Usage()

12
daemon/networkdriver/bridge/driver.go
View File

@ -307,11 +307,11 @@ func InitDriver(config *Config) error {
} }
} }
if gateway, err := requestDefaultGateway(config.DefaultGatewayIPv4, bridgeIPv4Network); err != nil { gateway, err := requestDefaultGateway(config.DefaultGatewayIPv4, bridgeIPv4Network)
if err != nil {
return err return err
} else {
gatewayIPv4 = gateway
} }
gatewayIPv4 = gateway
if config.FixedCIDRv6 != "" { if config.FixedCIDRv6 != "" {
_, subnet, err := net.ParseCIDR(config.FixedCIDRv6) _, subnet, err := net.ParseCIDR(config.FixedCIDRv6)
@ -325,11 +325,11 @@ func InitDriver(config *Config) error {
} }
globalIPv6Network = subnet globalIPv6Network = subnet
if gateway, err := requestDefaultGateway(config.DefaultGatewayIPv6, globalIPv6Network); err != nil { gateway, err := requestDefaultGateway(config.DefaultGatewayIPv6, globalIPv6Network)
if err != nil {
return err return err
} else {
gatewayIPv6 = gateway
} }
gatewayIPv6 = gateway
} }
// Block BridgeIP in IP allocator // Block BridgeIP in IP allocator

3
pkg/units/duration.go
View File

@ -26,7 +26,6 @@ func HumanDuration(d time.Duration) string {
return fmt.Sprintf("%d weeks", hours/24/7) return fmt.Sprintf("%d weeks", hours/24/7)
} else if hours < 24*365*2 { } else if hours < 24*365*2 {
return fmt.Sprintf("%d months", hours/24/30) return fmt.Sprintf("%d months", hours/24/30)
} else {
return fmt.Sprintf("%d years", hours/24/365)
} }
return fmt.Sprintf("%d years", int(d.Hours())/24/365)
} }