vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #12453 from runcom/style-minor-fixes

Browse source 
Add minor stylistic fixes
This commit is contained in:
Alexander Morozov 2015-04-20 11:51:04 -07:00
commit 9f94dd0a5f
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
iptables/iptables.go
View file

@ -41,7 +41,7 @@ type ChainError struct {
Output []byte Output []byte
} }
func (e *ChainError) Error() string { func (e ChainError) Error() string {
return fmt.Sprintf("Error iptables %s: %s", e.Chain, string(e.Output)) return fmt.Sprintf("Error iptables %s: %s", e.Chain, string(e.Output))
} }
@ -142,7 +142,7 @@ func (c *Chain) Forward(action Action, ip net.IP, port int, proto, destAddr stri
"--to-destination", net.JoinHostPort(destAddr, strconv.Itoa(destPort))); err != nil { "--to-destination", net.JoinHostPort(destAddr, strconv.Itoa(destPort))); err != nil {
return err return err
} else if len(output) != 0 { } else if len(output) != 0 {
return &ChainError{Chain: "FORWARD", Output: output} return ChainError{Chain: "FORWARD", Output: output}
} }
if output, err := Raw("-t", string(Filter), string(action), c.Name, if output, err := Raw("-t", string(Filter), string(action), c.Name,
@ -154,7 +154,7 @@ func (c *Chain) Forward(action Action, ip net.IP, port int, proto, destAddr stri
"-j", "ACCEPT"); err != nil { "-j", "ACCEPT"); err != nil {
return err return err
} else if len(output) != 0 { } else if len(output) != 0 {
return &ChainError{Chain: "FORWARD", Output: output} return ChainError{Chain: "FORWARD", Output: output}
} }
if output, err := Raw("-t", string(Nat), string(action), "POSTROUTING", if output, err := Raw("-t", string(Nat), string(action), "POSTROUTING",
@ -165,7 +165,7 @@ func (c *Chain) Forward(action Action, ip net.IP, port int, proto, destAddr stri
"-j", "MASQUERADE"); err != nil { "-j", "MASQUERADE"); err != nil {
return err return err
} else if len(output) != 0 { } else if len(output) != 0 {
return &ChainError{Chain: "FORWARD", Output: output} return ChainError{Chain: "FORWARD", Output: output}
} }
return nil return nil
@ -208,7 +208,7 @@ func (c *Chain) Prerouting(action Action, args ...string) error {
if output, err := Raw(append(a, "-j", c.Name)...); err != nil { if output, err := Raw(append(a, "-j", c.Name)...); err != nil {
return err return err
} else if len(output) != 0 { } else if len(output) != 0 {
return &ChainError{Chain: "PREROUTING", Output: output} return ChainError{Chain: "PREROUTING", Output: output}
} }
return nil return nil
} }
@ -222,7 +222,7 @@ func (c *Chain) Output(action Action, args ...string) error {
if output, err := Raw(append(a, "-j", c.Name)...); err != nil { if output, err := Raw(append(a, "-j", c.Name)...); err != nil {
return err return err
} else if len(output) != 0 { } else if len(output) != 0 {
return &ChainError{Chain: "OUTPUT", Output: output} return ChainError{Chain: "OUTPUT", Output: output}
} }
return nil return nil
} }

3
streamformatter/streamformatter.go
View file

@ -3,8 +3,9 @@ package streamformatter
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/docker/docker/pkg/jsonmessage"
"io" "io"
"github.com/docker/docker/pkg/jsonmessage"
) )
type StreamFormatter struct { type StreamFormatter struct {

3
streamformatter/streamformatter_test.go
View file

@ -3,9 +3,10 @@ package streamformatter
import ( import (
"encoding/json" "encoding/json"
"errors" "errors"
"github.com/docker/docker/pkg/jsonmessage"
"reflect" "reflect"
"testing" "testing"
"github.com/docker/docker/pkg/jsonmessage"
) )
func TestFormatStream(t *testing.T) { func TestFormatStream(t *testing.T) {