1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #970 from titanous/go1.1-unreachable

Remove code unreachable using Go 1.1
This commit is contained in:
Victor Vieux 2013-06-21 10:44:40 -07:00
commit 63e8a4ac74
4 changed files with 0 additions and 8 deletions

View file

@ -632,7 +632,6 @@ func (container *Container) waitLxc() error {
} }
time.Sleep(500 * time.Millisecond) time.Sleep(500 * time.Millisecond)
} }
panic("Unreachable")
} }
func (container *Container) monitor() { func (container *Container) monitor() {
@ -821,8 +820,6 @@ func (container *Container) WaitTimeout(timeout time.Duration) error {
case <-done: case <-done:
return nil return nil
} }
panic("Unreachable")
} }
func (container *Container) EnsureMounted() error { func (container *Container) EnsureMounted() error {

View file

@ -116,7 +116,6 @@ func crashTest() error {
return err return err
} }
} }
return nil
} }
func main() { func main() {

View file

@ -257,7 +257,6 @@ func proxy(listener net.Listener, proto, address string) error {
utils.Debugf("Connected to backend, splicing") utils.Debugf("Connected to backend, splicing")
splice(src, dst) splice(src, dst)
} }
panic("Unreachable")
} }
func halfSplice(dst, src net.Conn) error { func halfSplice(dst, src net.Conn) error {

View file

@ -236,7 +236,6 @@ func (r *bufReader) Read(p []byte) (n int, err error) {
} }
r.wait.Wait() r.wait.Wait()
} }
panic("unreachable")
} }
func (r *bufReader) Close() error { func (r *bufReader) Close() error {
@ -678,5 +677,3 @@ func ParseHost(host string, port int, addr string) string {
} }
return fmt.Sprintf("tcp://%s:%d", host, port) return fmt.Sprintf("tcp://%s:%d", host, port)
} }