Skip to content

Commit

Permalink
Run 'gofmt -s -w'
Browse files Browse the repository at this point in the history
  • Loading branch information
tianon committed Jan 7, 2014
1 parent fca83b4 commit 8f3b8f3
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions engine/http.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package engine

import (
"path"
"net/http"
"path"
)

// ServeHTTP executes a job as specified by the http request `r`, and sends the
Expand All @@ -22,7 +22,7 @@ func (eng *Engine) ServeHTTP(w http.ResponseWriter, r *http.Request) {
jobArgs = []string{}
}
w.Header().Set("Job-Name", jobName)
for _, arg := range(jobArgs) {
for _, arg := range jobArgs {
w.Header().Add("Job-Args", arg)
}
job := eng.Job(jobName, jobArgs...)
Expand Down
2 changes: 1 addition & 1 deletion reflink_copy_darwin.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package docker

import (
"os"
"io"
"os"
)

func CopyFile(dstFile, srcFile *os.File) error {
Expand Down
2 changes: 1 addition & 1 deletion reflink_copy_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ btrfs_reflink(int fd_out, int fd_in)
import "C"

import (
"os"
"io"
"os"
"syscall"
)

Expand Down
1 change: 0 additions & 1 deletion utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,6 @@ func migratePortMappings(config *Config, hostConfig *HostConfig) error {
return nil
}


// Links come in the format of
// name:alias
func parseLink(rawLink string) (map[string]string, error) {
Expand Down
2 changes: 1 addition & 1 deletion utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ func ParseHost(defaultHost string, defaultPort int, defaultUnix, addr string) (s
host string
port int
)
addr = strings.TrimSpace(addr)
addr = strings.TrimSpace(addr)
switch {
case strings.HasPrefix(addr, "unix://"):
proto = "unix"
Expand Down
6 changes: 3 additions & 3 deletions utils/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,9 @@ func TestParseHost(t *testing.T) {
if addr, err := ParseHost(defaultHttpHost, defaultHttpPort, defaultUnix, "tcp://:7777"); err != nil || addr != "tcp://127.0.0.1:7777" {
t.Errorf("tcp://:7777 -> expected tcp://127.0.0.1:7777, got %s", addr)
}
if addr, err := ParseHost(defaultHttpHost, defaultHttpPort, defaultUnix, ""); err != nil || addr != "unix:///var/run/docker.sock" {
t.Errorf("empty argument -> expected unix:///var/run/docker.sock, got %s", addr)
}
if addr, err := ParseHost(defaultHttpHost, defaultHttpPort, defaultUnix, ""); err != nil || addr != "unix:///var/run/docker.sock" {
t.Errorf("empty argument -> expected unix:///var/run/docker.sock, got %s", addr)
}
if addr, err := ParseHost(defaultHttpHost, defaultHttpPort, defaultUnix, "unix:///var/run/docker.sock"); err != nil || addr != "unix:///var/run/docker.sock" {
t.Errorf("unix:///var/run/docker.sock -> expected unix:///var/run/docker.sock, got %s", addr)
}
Expand Down

0 comments on commit 8f3b8f3

Please sign in to comment.