Remove some unnecessary variable assignments, per results of "clang"

tglsfdc · tglsfdc · commit aaa9f7d49598 · 2009-08-27T15:59:22.000Z
static checker.  Paul Matthews
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/geo_ops.c,v 1.103 2009/07/28 09:47:59 teodor Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/geo_ops.c,v 1.104 2009/08/27 15:59:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2939,7 +2939,7 @@ close_lseg(PG_FUNCTION_ARGS)
 		memcpy(&point, &l1->p[1], sizeof(Point));
 	}
 
-	if ((d = dist_ps_internal(&l2->p[0], l1)) < dist)
+	if (dist_ps_internal(&l2->p[0], l1) < dist)
 	{
 		result = DatumGetPointP(DirectFunctionCall2(close_ps,
 													PointPGetDatum(&l2->p[0]),
@@ -2950,7 +2950,7 @@ close_lseg(PG_FUNCTION_ARGS)
 													LsegPGetDatum(l2)));
 	}
 
-	if ((d = dist_ps_internal(&l2->p[1], l1)) < dist)
+	if (dist_ps_internal(&l2->p[1], l1) < dist)
 	{
 		result = DatumGetPointP(DirectFunctionCall2(close_ps,
 													PointPGetDatum(&l2->p[1]),
@@ -2990,7 +2990,7 @@ close_pb(PG_FUNCTION_ARGS)
 	point.x = box->low.x;
 	point.y = box->high.y;
 	statlseg_construct(&lseg, &box->low, &point);
-	dist = d = dist_ps_internal(pt, &lseg);
+	dist = dist_ps_internal(pt, &lseg);
 
 	statlseg_construct(&seg, &box->high, &point);
 	if ((d = dist_ps_internal(pt, &seg)) < dist)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/geo_ops.c,v 1.103 2009/07/28 09:47:59 teodor Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/geo_ops.c,v 1.104 2009/08/27 15:59:22 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -2939,7 +2939,7 @@ close_lseg(PG_FUNCTION_ARGS)`
`2939`	`2939`	`memcpy(&point, &l1->p[1], sizeof(Point));`
`2940`	`2940`	`}`
`2941`	`2941`
`2942`		`- if ((d = dist_ps_internal(&l2->p[0], l1)) < dist)`
	`2942`	`+ if (dist_ps_internal(&l2->p[0], l1) < dist)`
`2943`	`2943`	`{`
`2944`	`2944`	`result = DatumGetPointP(DirectFunctionCall2(close_ps,`
`2945`	`2945`	`PointPGetDatum(&l2->p[0]),`
`@@ -2950,7 +2950,7 @@ close_lseg(PG_FUNCTION_ARGS)`
`2950`	`2950`	`LsegPGetDatum(l2)));`
`2951`	`2951`	`}`
`2952`	`2952`
`2953`		`- if ((d = dist_ps_internal(&l2->p[1], l1)) < dist)`
	`2953`	`+ if (dist_ps_internal(&l2->p[1], l1) < dist)`
`2954`	`2954`	`{`
`2955`	`2955`	`result = DatumGetPointP(DirectFunctionCall2(close_ps,`
`2956`	`2956`	`PointPGetDatum(&l2->p[1]),`
`@@ -2990,7 +2990,7 @@ close_pb(PG_FUNCTION_ARGS)`
`2990`	`2990`	`point.x = box->low.x;`
`2991`	`2991`	`point.y = box->high.y;`
`2992`	`2992`	`statlseg_construct(&lseg, &box->low, &point);`
`2993`		`- dist = d = dist_ps_internal(pt, &lseg);`
	`2993`	`+ dist = dist_ps_internal(pt, &lseg);`
`2994`	`2994`
`2995`	`2995`	`statlseg_construct(&seg, &box->high, &point);`
`2996`	`2996`	`if ((d = dist_ps_internal(pt, &seg)) < dist)`