Fix variable name collision

maddie · maddie · commit 02de79bf8d02 · 2020-09-16T14:23:01.000+08:00
diff --git a/defs/server.go b/defs/server.go
@@ -171,9 +171,9 @@ func (s *Server) PingAndJitter(count int) (float64, float64, error) {
 	}
 
 	var lastPing, jitter float64
-	for idx, ping := range pings {
+	for idx, p := range pings {
 		if idx != 0 {
-			instJitter := math.Abs(lastPing - ping)
+			instJitter := math.Abs(lastPing - p)
 			if idx > 1 {
 				if jitter > instJitter {
 					jitter = jitter*0.7 + instJitter*0.3
@@ -182,7 +182,7 @@ func (s *Server) PingAndJitter(count int) (float64, float64, error) {
 				}
 			}
 		}
-		lastPing = ping
+		lastPing = p
 	}
 
 	return getAvg(pings), jitter, nil

Original file line number	Diff line number	Diff line change
`@@ -171,9 +171,9 @@ func (s *Server) PingAndJitter(count int) (float64, float64, error) {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`var lastPing, jitter float64`
`174`		`- for idx, ping := range pings {`
	`174`	`+ for idx, p := range pings {`
`175`	`175`	`if idx != 0 {`
`176`		`- instJitter := math.Abs(lastPing - ping)`
	`176`	`+ instJitter := math.Abs(lastPing - p)`
`177`	`177`	`if idx > 1 {`
`178`	`178`	`if jitter > instJitter {`
`179`	`179`	`jitter = jitter0.7 + instJitter0.3`
`@@ -182,7 +182,7 @@ func (s *Server) PingAndJitter(count int) (float64, float64, error) {`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`	`}`
`185`		`- lastPing = ping`
	`185`	`+ lastPing = p`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`return getAvg(pings), jitter, nil`