From 98015c6e6297782935dcb64513410eafc1f0b346 Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Sat, 13 Dec 2014 00:01:46 +0000
Subject: [PATCH] remove useless create fct

Signed-off-by: Victor Vieux <vieux@docker.com>
---
 discovery/discovery.go   | 11 +++++------
 discovery/etcd/etcd.go   |  6 +-----
 discovery/file/file.go   |  6 +-----
 discovery/token/token.go |  6 +-----
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/discovery/discovery.go b/discovery/discovery.go
index 60c225cdf0..843dd5bc3d 100644
--- a/discovery/discovery.go
+++ b/discovery/discovery.go
@@ -34,21 +34,21 @@ type DiscoveryService interface {
 }
 
 var (
-	discoveries       map[string]func() DiscoveryService
+	discoveries       map[string]DiscoveryService
 	ErrNotSupported   = errors.New("discovery service not supported")
 	ErrNotImplemented = errors.New("not implemented in this discovery service")
 )
 
 func init() {
-	discoveries = make(map[string]func() DiscoveryService)
+	discoveries = make(map[string]DiscoveryService)
 }
 
-func Register(scheme string, f func() DiscoveryService) error {
+func Register(scheme string, d DiscoveryService) error {
 	if _, exists := discoveries[scheme]; exists {
 		return fmt.Errorf("scheme already registered %s", scheme)
 	}
 	log.Debugf("Registering %q discovery service", scheme)
-	discoveries[scheme] = f
+	discoveries[scheme] = d
 
 	return nil
 }
@@ -59,9 +59,8 @@ func New(rawurl string, heartbeat int) (DiscoveryService, error) {
 		return nil, err
 	}
 
-	if f, exists := discoveries[url.Scheme]; exists {
+	if discovery, exists := discoveries[url.Scheme]; exists {
 		log.Debugf("Initialising %q discovery service with %q", url.Scheme, url.Host+url.Path)
-		discovery := f()
 		err := discovery.Initialize(url.Host+url.Path, heartbeat)
 		return discovery, err
 	}
diff --git a/discovery/etcd/etcd.go b/discovery/etcd/etcd.go
index 80f3f87460..9e4efe4d0c 100644
--- a/discovery/etcd/etcd.go
+++ b/discovery/etcd/etcd.go
@@ -16,11 +16,7 @@ type EtcdDiscoveryService struct {
 }
 
 func init() {
-	discovery.Register("etcd",
-		func() discovery.DiscoveryService {
-			return &EtcdDiscoveryService{}
-		},
-	)
+	discovery.Register("etcd", &EtcdDiscoveryService{})
 }
 
 func (s *EtcdDiscoveryService) Initialize(uris string, heartbeat int) error {
diff --git a/discovery/file/file.go b/discovery/file/file.go
index ec9b90ca2a..47ed538613 100644
--- a/discovery/file/file.go
+++ b/discovery/file/file.go
@@ -14,11 +14,7 @@ type FileDiscoveryService struct {
 }
 
 func init() {
-	discovery.Register("file",
-		func() discovery.DiscoveryService {
-			return &FileDiscoveryService{}
-		},
-	)
+	discovery.Register("file", &FileDiscoveryService{})
 }
 
 func (s *FileDiscoveryService) Initialize(path string, heartbeat int) error {
diff --git a/discovery/token/token.go b/discovery/token/token.go
index 3fb0995413..633e8d1d52 100644
--- a/discovery/token/token.go
+++ b/discovery/token/token.go
@@ -20,11 +20,7 @@ type TokenDiscoveryService struct {
 }
 
 func init() {
-	discovery.Register("token",
-		func() discovery.DiscoveryService {
-			return &TokenDiscoveryService{}
-		},
-	)
+	discovery.Register("token", &TokenDiscoveryService{})
 }
 
 func (s *TokenDiscoveryService) Initialize(urltoken string, heartbeat int) error {