Skip to content

Commit b4b2831

Browse files
committed
Remove variable conflict with the package import name
Signed-off-by: Humble Chirammal <[email protected]>
1 parent 15e8a51 commit b4b2831

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

cmd/csi-proxy/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ limitations under the License.
1414
package main
1515

1616
var (
17-
version string = "Unknown"
17+
version = "Unknown"
1818
)

integrationtests/smb_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
const letterset = "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
2222

23-
var seededRand *rand.Rand = rand.New(rand.NewSource(time.Now().UnixNano()))
23+
var seededRand = rand.New(rand.NewSource(time.Now().UnixNano()))
2424

2525
func stringWithCharset(length int, charset string) string {
2626
b := make([]byte, length)

internal/server/server.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ func NewServer(apiGroups ...srvtypes.APIGroup) *Server {
3939
// others).
4040
// If passed a listeningChan, it will close it when it's started listening.
4141
func (s *Server) Start(listeningChan chan interface{}) []error {
42-
doneChan, errors := s.startListening()
43-
if len(errors) != 0 {
44-
return errors
42+
doneChan, ListenErr := s.startListening()
43+
if len(ListenErr) != 0 {
44+
return ListenErr
4545
}
4646
defer close(doneChan)
4747

@@ -62,9 +62,9 @@ func (s *Server) startListening() (chan *versionedAPIDone, []error) {
6262
}
6363
s.started = true
6464

65-
listeners, errors := s.createListeners()
66-
if len(errors) != 0 {
67-
return nil, errors
65+
listeners, ListenErr := s.createListeners()
66+
if len(ListenErr) != 0 {
67+
return nil, ListenErr
6868
}
6969

7070
return s.createAndStartGRPCServers(listeners), nil

0 commit comments

Comments
 (0)