From e6a7cfd76274c718676bf69ee7a5105497595014 Mon Sep 17 00:00:00 2001 From: IWASE Yusuke Date: Thu, 9 Nov 2017 11:31:47 +0900 Subject: 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 --- api/grpc_server.go | 6 +++--- 1 file 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 { -- cgit v1.2.3