From 7a870dfbb1c9639eec16136be640ce3963f2ed6b Mon Sep 17 00:00:00 2001
From: Asim <asim@chuhnk.me>
Date: Wed, 2 Dec 2015 01:18:32 +0000
Subject: [PATCH] Strip named registration

---
 server/rpc_server.go     |  2 +-
 server/rpcplus_server.go | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/server/rpc_server.go b/server/rpc_server.go
index b998a21c..d28bb658 100644
--- a/server/rpc_server.go
+++ b/server/rpc_server.go
@@ -110,7 +110,7 @@ func (s *rpcServer) NewHandler(h interface{}) Handler {
 }
 
 func (s *rpcServer) Handle(h Handler) error {
-	if err := s.rpc.Register(h.Handler()); err != nil {
+	if err := s.rpc.register(h.Handler()); err != nil {
 		return err
 	}
 	s.Lock()
diff --git a/server/rpcplus_server.go b/server/rpcplus_server.go
index ec13cc76..7c1e008a 100644
--- a/server/rpcplus_server.go
+++ b/server/rpcplus_server.go
@@ -94,10 +94,6 @@ func isExportedOrBuiltinType(t reflect.Type) bool {
 	return isExported(t.Name()) || t.PkgPath() == ""
 }
 
-func (server *server) Register(rcvr interface{}) error {
-	return server.register(rcvr, "", false)
-}
-
 // prepareMethod returns a methodType for the provided method or nil
 // in case if the method was unsuitable.
 func prepareMethod(method reflect.Method) *methodType {
@@ -173,7 +169,7 @@ func prepareMethod(method reflect.Method) *methodType {
 	return &methodType{method: method, ArgType: argType, ReplyType: replyType, ContextType: contextType, stream: stream}
 }
 
-func (server *server) register(rcvr interface{}, name string, useName bool) error {
+func (server *server) register(rcvr interface{}) error {
 	server.mu.Lock()
 	defer server.mu.Unlock()
 	if server.serviceMap == nil {
@@ -183,13 +179,10 @@ func (server *server) register(rcvr interface{}, name string, useName bool) erro
 	s.typ = reflect.TypeOf(rcvr)
 	s.rcvr = reflect.ValueOf(rcvr)
 	sname := reflect.Indirect(s.rcvr).Type().Name()
-	if useName {
-		sname = name
-	}
 	if sname == "" {
 		log.Fatal("rpc: no service name for type", s.typ.String())
 	}
-	if !isExported(sname) && !useName {
+	if !isExported(sname) {
 		s := "rpc Register: type " + sname + " is not exported"
 		log.Print(s)
 		return errors.New(s)