@@ -21,7 +21,7 @@ const INDEX_SERVER = "https://index.docker.io/v1"

 //const INDEX_SERVER = "http://indexstaging-docker.dotcloud.com/"

 var (

-	ErrConfigFileMissing error = errors.New("The Auth config file is missing")

+	ErrConfigFileMissing = errors.New("The Auth config file is missing")

 )

 type AuthConfig struct {

@@ -222,11 +222,11 @@ func (b *builderClient) commit(id string) error {

 	if id == "" {

 		cmd := b.config.Cmd

 		b.config.Cmd = []string{"true"}

-		if cid, err := b.run(); err != nil {

+		cid, err := b.run()

+		if err != nil {

 			return err

-		} else {

-			id = cid

 		}

+		id = cid

 		b.config.Cmd = cmd

 	}

@@ -272,11 +272,11 @@ func (b *buildFile) commit(id string, autoCmd []string, comment string) error {

 			utils.Debugf("[BUILDER] Cache miss")

 		}

-		if cid, err := b.run(); err != nil {

+		cid, err := b.run()

+		if err != nil {

 			return err

-		} else {

-			id = cid

 		}

+		id = cid

 	}

 	container := b.runtime.Get(id)

@@ -159,11 +159,11 @@ func (cli *DockerCli) CmdBuild(args ...string) error {

 		file = os.Stdin

 	} else {

 		// Send Dockerfile from arg/Dockerfile (deprecate later)

-		if f, err := os.Open(path.Join(cmd.Arg(0), "Dockerfile")); err != nil {

+		f, err := os.Open(path.Join(cmd.Arg(0), "Dockerfile"))

+		if err != nil {

 			return err

-		} else {

-			file = f

 		}

+		file = f

 		// Send context from arg

 		// Create a FormFile multipart for the context if needed

 		// FIXME: Use NewTempArchive in order to have the size and avoid too much memory usage?

@@ -176,21 +176,21 @@ func (cli *DockerCli) CmdBuild(args ...string) error {

 		if err != nil {

 			return err

 		}

-		if wField, err := w.CreateFormFile("Context", filepath.Base(absPath)+"."+compression.Extension()); err != nil {

+		wField, err := w.CreateFormFile("Context", filepath.Base(absPath)+"."+compression.Extension())

+		if err != nil {

 			return err

-		} else {

-			// FIXME: Find a way to have a progressbar for the upload too

-			sf := utils.NewStreamFormatter(false)

-			io.Copy(wField, utils.ProgressReader(ioutil.NopCloser(context), -1, os.Stdout, sf.FormatProgress("Caching Context", "%v/%v (%v)"), sf))

 		}

+		// FIXME: Find a way to have a progressbar for the upload too

+		sf := utils.NewStreamFormatter(false)

+		io.Copy(wField, utils.ProgressReader(ioutil.NopCloser(context), -1, os.Stdout, sf.FormatProgress("Caching Context", "%v/%v (%v)"), sf))

 		multipartBody = io.MultiReader(multipartBody, boundary)

 	}

 	// Create a FormFile multipart for the Dockerfile

-	if wField, err := w.CreateFormFile("Dockerfile", "Dockerfile"); err != nil {

+	wField, err := w.CreateFormFile("Dockerfile", "Dockerfile")

+	if err != nil {

 		return err

-	} else {

-		io.Copy(wField, file)

 	}

+	io.Copy(wField, file)

 	multipartBody = io.MultiReader(multipartBody, boundary)

 	v := &url.Values{}

@@ -276,9 +276,8 @@ func (cli *DockerCli) CmdLogin(args ...string) error {

 	oldState, err := term.SetRawTerminal()

 	if err != nil {

 		return err

-	} else {

-		defer term.RestoreTerminal(oldState)

 	}

+	defer term.RestoreTerminal(oldState)

 	cmd := Subcmd("login", "", "Register or Login to the docker registry server")

 	if err := cmd.Parse(args); err != nil {

@@ -1417,11 +1416,11 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in *os.Fi

 	})

 	if in != nil && setRawTerminal && term.IsTerminal(in.Fd()) && os.Getenv("NORAW") == "" {

-		if oldState, err := term.SetRawTerminal(); err != nil {

+		oldState, err := term.SetRawTerminal()

+		if err != nil {

 			return err

-		} else {

-			defer term.RestoreTerminal(oldState)

 		}

+		defer term.RestoreTerminal(oldState)

 	}

 	sendStdin := utils.Go(func() error {

 		_, err := io.Copy(rwc, in)

@@ -431,14 +431,14 @@ func (container *Container) Start() error {

 	// Create the requested volumes volumes

 	for volPath := range container.Config.Volumes {

-		if c, err := container.runtime.volumes.Create(nil, container, "", "", nil); err != nil {

+		c, err := container.runtime.volumes.Create(nil, container, "", "", nil)

+		if err != nil {

 			return err

-		} else {

-			if err := os.MkdirAll(path.Join(container.RootfsPath(), volPath), 0755); err != nil {

-				return nil

-			}

-			container.Volumes[volPath] = c.Id

 		}

+		if err := os.MkdirAll(path.Join(container.RootfsPath(), volPath), 0755); err != nil {

+			return nil

+		}

+		container.Volumes[volPath] = c.Id

 	}

 	if container.Config.VolumesFrom != "" {

@@ -573,12 +573,12 @@ func (container *Container) allocateNetwork() error {

 	}

 	container.NetworkSettings.PortMapping = make(map[string]string)

 	for _, spec := range container.Config.PortSpecs {

-		if nat, err := iface.AllocatePort(spec); err != nil {

+		nat, err := iface.AllocatePort(spec)

+		if err != nil {

 			iface.Release()

 			return err

-		} else {

-			container.NetworkSettings.PortMapping[strconv.Itoa(nat.Backend)] = strconv.Itoa(nat.Frontend)

 		}

+		container.NetworkSettings.PortMapping[strconv.Itoa(nat.Backend)] = strconv.Itoa(nat.Frontend)

 	}

 	container.network = iface

 	container.NetworkSettings.Bridge = container.runtime.networkManager.bridgeIface

@@ -597,12 +597,12 @@ func (container *Container) releaseNetwork() {

 // FIXME: replace this with a control socket within docker-init

 func (container *Container) waitLxc() error {

 	for {

-		if output, err := exec.Command("lxc-info", "-n", container.Id).CombinedOutput(); err != nil {

+		output, err := exec.Command("lxc-info", "-n", container.Id).CombinedOutput()

+		if err != nil {

 			return err

-		} else {

-			if !strings.Contains(string(output), "RUNNING") {

-				return nil

-			}

+		}

+		if !strings.Contains(string(output), "RUNNING") {

+			return nil

 		}

 		time.Sleep(500 * time.Millisecond)

 	}

@@ -625,7 +625,7 @@ func (container *Container) monitor() {

 	}

 	utils.Debugf("Process finished")

-	var exitCode int = -1

+	exitCode := -1

 	if container.cmd != nil {

 		exitCode = container.cmd.ProcessState.Sys().(syscall.WaitStatus).ExitStatus()

 	}

@@ -11,7 +11,7 @@ import (

 	"time"

 )

-var DOCKER_PATH string = path.Join(os.Getenv("DOCKERPATH"), "docker")

+var DOCKER_PATH = path.Join(os.Getenv("DOCKERPATH"), "docker")

 // WARNING: this crashTest will 1) crash your host, 2) remove all containers

 func runDaemon() (*exec.Cmd, error) {

@@ -49,9 +49,8 @@ func LoadImage(root string) (*Image, error) {

 	if stat, err := os.Stat(layerPath(root)); err != nil {

 		if os.IsNotExist(err) {

 			return nil, fmt.Errorf("Couldn't load image %s: no filesystem layer", img.Id)

-		} else {

-			return nil, err

 		}

+		return nil, err

 	} else if !stat.IsDir() {

 		return nil, fmt.Errorf("Couldn't load image %s: %s is not a directory", img.Id, layerPath(root))

 	}

@@ -132,9 +132,8 @@ func CreateBridgeIface(ifaceName string) error {

 	}

 	if ifaceAddr == "" {

 		return fmt.Errorf("Could not find a free IP address range for interface '%s'. Please configure its address manually and run 'docker -b %s'", ifaceName, ifaceName)

-	} else {

-		utils.Debugf("Creating bridge %s with network %s", ifaceName, ifaceAddr)

 	}

+	utils.Debugf("Creating bridge %s with network %s", ifaceName, ifaceAddr)

 	if output, err := ip("link", "add", ifaceName, "type", "bridge"); err != nil {

 		return fmt.Errorf("Error creating bridge: %s (output: %s)", err, output)

@@ -464,11 +463,11 @@ func (iface *NetworkInterface) AllocatePort(spec string) (*Nat, error) {

 		return nil, err

 	}

 	// Allocate a random port if Frontend==0

-	if extPort, err := iface.manager.portAllocator.Acquire(nat.Frontend); err != nil {

+	extPort, err := iface.manager.portAllocator.Acquire(nat.Frontend)

+	if err != nil {

 		return nil, err

-	} else {

-		nat.Frontend = extPort

 	}

+	nat.Frontend = extPort

 	if err := iface.manager.portMapper.Map(nat.Frontend, net.TCPAddr{IP: iface.IPNet.IP, Port: nat.Backend}); err != nil {

 		iface.manager.portAllocator.Release(nat.Frontend)

 		return nil, err

@@ -15,7 +15,7 @@ import (

 	"strings"

 )

-var ErrAlreadyExists error = errors.New("Image already exists")

+var ErrAlreadyExists = errors.New("Image already exists")

 func doWithCookies(c *http.Client, req *http.Request) (*http.Response, error) {

 	for _, cookie := range c.Jar.Cookies(req.URL) {

@@ -396,11 +396,11 @@ func (r *Registry) PushImageJsonIndex(remote string, imgList []*ImgData, validat

 	}

 	if validate {

 		if res.StatusCode != 204 {

-			if errBody, err := ioutil.ReadAll(res.Body); err != nil {

+			errBody, err := ioutil.ReadAll(res.Body)

+			if err != nil {

 				return nil, err

-			} else {

-				return nil, fmt.Errorf("Error: Status %d trying to push checksums %s: %s", res.StatusCode, remote, errBody)

 			}

+			return nil, fmt.Errorf("Error: Status %d trying to push checksums %s: %s", res.StatusCode, remote, errBody)

 		}

 	}

@@ -133,25 +133,25 @@ func (runtime *Runtime) Register(container *Container) error {

 	//        if so, then we need to restart monitor and init a new lock

 	// If the container is supposed to be running, make sure of it

 	if container.State.Running {

-		if output, err := exec.Command("lxc-info", "-n", container.Id).CombinedOutput(); err != nil {

+		output, err := exec.Command("lxc-info", "-n", container.Id).CombinedOutput()

+		if err != nil {

 			return err

-		} else {

-			if !strings.Contains(string(output), "RUNNING") {

-				utils.Debugf("Container %s was supposed to be running be is not.", container.Id)

-				if runtime.autoRestart {

-					utils.Debugf("Restarting")

-					container.State.Ghost = false

-					container.State.setStopped(0)

-					if err := container.Start(); err != nil {

-						return err

-					}

-					nomonitor = true

-				} else {

-					utils.Debugf("Marking as stopped")

-					container.State.setStopped(-127)

-					if err := container.ToDisk(); err != nil {

-						return err

-					}

+		}

+		if !strings.Contains(string(output), "RUNNING") {

+			utils.Debugf("Container %s was supposed to be running be is not.", container.Id)

+			if runtime.autoRestart {

+				utils.Debugf("Restarting")

+				container.State.Ghost = false

+				container.State.setStopped(0)

+				if err := container.Start(); err != nil {

+					return err

+				}

+				nomonitor = true

+			} else {

+				utils.Debugf("Marking as stopped")

+				container.State.setStopped(-127)

+				if err := container.ToDisk(); err != nil {

+					return err

 				}

 			}

 		}

@@ -216,7 +216,7 @@ func (srv *Server) ImageHistory(name string) ([]ApiHistory, error) {

 		return nil, err

 	}

-	var outs []ApiHistory = []ApiHistory{} //produce [] when empty instead of 'null'

+	outs := []ApiHistory{} //produce [] when empty instead of 'null'

 	err = image.WalkHistory(func(img *Image) error {

 		var out ApiHistory

 		out.Id = srv.runtime.repositories.ImageName(img.ShortId())

@@ -356,11 +356,11 @@ func (srv *Server) pullRepository(r *registry.Registry, out io.Writer, remote, a

 		}

 	} else {

 		// Otherwise, check that the tag exists and use only that one

-		if id, exists := tagsList[askedTag]; !exists {

+		id, exists := tagsList[askedTag]

+		if !exists {

 			return fmt.Errorf("Tag %s not found in repositoy %s", askedTag, remote)

-		} else {

-			repoData.ImgList[id].Tag = askedTag

 		}

+		repoData.ImgList[id].Tag = askedTag

 	}

 	for _, img := range repoData.ImgList {

@@ -714,10 +714,9 @@ func (srv *Server) ImageDelete(name string) error {

 	img, err := srv.runtime.repositories.LookupImage(name)

 	if err != nil {

 		return fmt.Errorf("No such image: %s", name)

-	} else {

-		if err := srv.runtime.graph.Delete(img.Id); err != nil {

-			return fmt.Errorf("Error deleting image %s: %s", name, err.Error())

-		}

+	}

+	if err := srv.runtime.graph.Delete(img.Id); err != nil {

+		return fmt.Errorf("Error deleting image %s: %s", name, err.Error())

 	}

 	return nil

 }

@@ -34,7 +34,7 @@ func Go(f func() error) chan error {

 // Request a given URL and return an io.Reader

 func Download(url string, stderr io.Writer) (*http.Response, error) {

 	var resp *http.Response

-	var err error = nil

+	var err error

 	if resp, err = http.Get(url); err != nil {

 		return nil, err

 	}