Merge #151380

151380: geomfn: return correct error variable r=yuzefovich a=stevendanna

These were found by an in-development linter (#151123).

Epic: none
Release note: None

Co-authored-by: Steven Danna <danna@cockroachlabs.com>

Author: craig[bot]

pkg/geo/geomfn/distance.go

@@ -220,7 +220,7 @@ func distanceInternal(
 	aIt := geo.NewGeomTIterator(aGeomT, emptyBehavior)
 	aGeom, aNext, aErr := aIt.Next()
 	if aErr != nil {
-		return 0, err
+		return 0, aErr
 	}
 	for aNext {
 		aGeodist, err := geomToGeodist(aGeom)
@@ -231,7 +231,7 @@ func distanceInternal(
 		bIt := geo.NewGeomTIterator(bGeomT, emptyBehavior)
 		bGeom, bNext, bErr := bIt.Next()
 		if bErr != nil {
-			return 0, err
+			return 0, bErr
 		}
 		for bNext {
 			bGeodist, err := geomToGeodist(bGeom)
@@ -248,13 +248,13 @@ func distanceInternal(
 
 			bGeom, bNext, bErr = bIt.Next()
 			if bErr != nil {
-				return 0, err
+				return 0, bErr
 			}
 		}
 
 		aGeom, aNext, aErr = aIt.Next()
 		if aErr != nil {
-			return 0, err
+			return 0, aErr
 		}
 	}
 	return c.DistanceUpdater().Distance(), nil