summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIWASE Yusuke <iwase.yusuke0@gmail.com>2017-11-09 11:31:47 +0900
committerIWASE Yusuke <iwase.yusuke0@gmail.com>2017-11-13 11:20:07 +0900
commite6a7cfd76274c718676bf69ee7a5105497595014 (patch)
tree3ba26cf020443f6ece7bba0c8f013d55e632d0b3
parent9f330e66090827ce0f4e70906640e0ed76df2624 (diff)
api/grpc_server: Avoid name collision "server"
To improve code inspection result, this patch renames "server" variables in NewServer() to "s" because "server" collides the imported package name "github.com/osrg/gobgp/server". Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
-rw-r--r--api/grpc_server.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/api/grpc_server.go b/api/grpc_server.go
index 4567f715..a359f761 100644
--- a/api/grpc_server.go
+++ b/api/grpc_server.go
@@ -49,13 +49,13 @@ func NewGrpcServer(b *server.BgpServer, hosts string) *Server {
func NewServer(b *server.BgpServer, g *grpc.Server, hosts string) *Server {
grpc.EnableTracing = false
- server := &Server{
+ s := &Server{
bgpServer: b,
grpcServer: g,
hosts: hosts,
}
- RegisterGobgpApiServer(g, server)
- return server
+ RegisterGobgpApiServer(g, s)
+ return s
}
func (s *Server) Serve() error {