From 927d13bc3c2030bb0e0429dbc500f13d72e7ccf6 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Sat, 20 Jun 2015 14:28:18 +0200 Subject: [PATCH] Remove dead code Signed-off-by: Antonio Murdaca --- daemon/daemon_unix.go | 3 --- daemon/daemon_windows.go | 2 -- docker/client.go | 2 -- docker/daemon.go | 2 -- graph/graph.go | 14 -------------- registry/registry.go | 24 ------------------------ registry/registry_test.go | 24 ++++++++++++++++++++++++ runconfig/parse.go | 19 ------------------- 8 files changed, 24 insertions(+), 66 deletions(-) diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 0275675c21..ee5d5718b6 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -31,9 +31,6 @@ import ( "github.com/docker/libnetwork/options" ) -const runDir = "/var/run/docker" -const defaultVolumesPathName = "volumes" - func (daemon *Daemon) Changes(container *Container) ([]archive.Change, error) { initID := fmt.Sprintf("%s-init", container.ID) return daemon.driver.Changes(container.ID, initID) diff --git a/daemon/daemon_windows.go b/daemon/daemon_windows.go index 6639994b66..05d7bd2d1f 100644 --- a/daemon/daemon_windows.go +++ b/daemon/daemon_windows.go @@ -12,8 +12,6 @@ import ( "github.com/docker/libnetwork" ) -var runDir = os.Getenv("TEMP") - func (daemon *Daemon) Changes(container *Container) ([]archive.Change, error) { return daemon.driver.Changes(container.ID, container.ImageID) } diff --git a/docker/client.go b/docker/client.go index cde1a6d3dc..0e05f7b8ce 100644 --- a/docker/client.go +++ b/docker/client.go @@ -6,8 +6,6 @@ import ( "log" // see gh#8745, client needs to use go log pkg ) -const CanDaemon = false - func mainDaemon() { log.Fatal("This is a client-only binary - running the Docker daemon is not supported.") } diff --git a/docker/daemon.go b/docker/daemon.go index 8ff0fe1cf0..2b4125c959 100644 --- a/docker/daemon.go +++ b/docker/daemon.go @@ -24,8 +24,6 @@ import ( "github.com/docker/docker/utils" ) -const CanDaemon = true - var ( daemonCfg = &daemon.Config{} registryCfg = ®istry.Options{} diff --git a/graph/graph.go b/graph/graph.go index 5c5b5f0656..0db81ab6a4 100644 --- a/graph/graph.go +++ b/graph/graph.go @@ -270,20 +270,6 @@ func bufferToFile(f *os.File, src io.Reader) (int64, digest.Digest, error) { return n, digest.NewDigest("sha256", h), nil } -// Check if given error is "not empty". -// Note: this is the way golang does it internally with os.IsNotExists. -func isNotEmpty(err error) bool { - switch pe := err.(type) { - case nil: - return false - case *os.PathError: - err = pe.Err - case *os.LinkError: - err = pe.Err - } - return strings.Contains(err.Error(), " not empty") -} - // Delete atomically removes an image from the graph. func (graph *Graph) Delete(name string) error { id, err := graph.idIndex.Get(name) diff --git a/registry/registry.go b/registry/registry.go index 80d4268e61..8b78af965d 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -8,7 +8,6 @@ import ( "io/ioutil" "net" "net/http" - "net/http/httputil" "os" "path" "path/filepath" @@ -200,29 +199,6 @@ func DockerHeaders(metaHeaders http.Header) []transport.RequestModifier { return modifiers } -type debugTransport struct { - http.RoundTripper - log func(...interface{}) -} - -func (tr debugTransport) RoundTrip(req *http.Request) (*http.Response, error) { - dump, err := httputil.DumpRequestOut(req, false) - if err != nil { - tr.log("could not dump request") - } - tr.log(string(dump)) - resp, err := tr.RoundTripper.RoundTrip(req) - if err != nil { - return nil, err - } - dump, err = httputil.DumpResponse(resp, false) - if err != nil { - tr.log("could not dump response") - } - tr.log(string(dump)) - return resp, err -} - func HTTPClient(transport http.RoundTripper) *http.Client { if transport == nil { transport = NewTransport(ConnectTimeout, true) diff --git a/registry/registry_test.go b/registry/registry_test.go index a6bd720174..7233075bad 100644 --- a/registry/registry_test.go +++ b/registry/registry_test.go @@ -3,6 +3,7 @@ package registry import ( "fmt" "net/http" + "net/http/httputil" "net/url" "strings" "testing" @@ -911,3 +912,26 @@ func TestIsSecureIndex(t *testing.T) { } } } + +type debugTransport struct { + http.RoundTripper + log func(...interface{}) +} + +func (tr debugTransport) RoundTrip(req *http.Request) (*http.Response, error) { + dump, err := httputil.DumpRequestOut(req, false) + if err != nil { + tr.log("could not dump request") + } + tr.log(string(dump)) + resp, err := tr.RoundTripper.RoundTrip(req) + if err != nil { + return nil, err + } + dump, err = httputil.DumpResponse(resp, false) + if err != nil { + tr.log("could not dump response") + } + tr.log(string(dump)) + return resp, err +} diff --git a/runconfig/parse.go b/runconfig/parse.go index b622c5eec8..87bf4ac676 100644 --- a/runconfig/parse.go +++ b/runconfig/parse.go @@ -451,25 +451,6 @@ func ParseRestartPolicy(policy string) (RestartPolicy, error) { return p, nil } -// options will come in the format of name.key=value or name.option -func parseDriverOpts(opts opts.ListOpts) (map[string][]string, error) { - out := make(map[string][]string, len(opts.GetAll())) - for _, o := range opts.GetAll() { - parts := strings.SplitN(o, ".", 2) - if len(parts) < 2 { - return nil, fmt.Errorf("invalid opt format %s", o) - } else if strings.TrimSpace(parts[0]) == "" { - return nil, fmt.Errorf("key cannot be empty %s", o) - } - values, exists := out[parts[0]] - if !exists { - values = []string{} - } - out[parts[0]] = append(values, parts[1]) - } - return out, nil -} - func parseKeyValueOpts(opts opts.ListOpts) ([]KeyValuePair, error) { out := make([]KeyValuePair, opts.Len()) for i, o := range opts.GetAll() {