More refactoring.

Author: akorotkov

box.c

@@ -99,16 +99,13 @@ sbox_check(SBOX *box)
  /*
   * Puts "center" of box "b" into point "c" and returns it.
   */
-static SPoint *
+static void
 sbox_center(SPoint *c, const SBOX *b)
 {
 	c->lat = (b->ne.lat + b->sw.lat) / 2.0;
 	c->lng = (b->ne.lng + b->sw.lng) / 2.0;
 	if (FPgt(b->sw.lng, b->ne.lng))
-	{
 		c->lng += PI;
-	}
-	return c;
 }
 
 

circle.c

@@ -44,17 +44,16 @@ spoint_in_circle(const SPoint *p, const SCIRCLE *c)
 
 	if (FPle(dist, c->radius))
 	{
-		return (TRUE);
+		return true;
 	}
-	return (FALSE);
+	return false;
 }
 
-SCIRCLE *
+void
 euler_scircle_trans(SCIRCLE *out, const SCIRCLE *in, const SEuler *se)
 {
 	euler_spoint_trans(&out->center, &in->center, se);
 	out->radius = in->radius;
-	return out;
 }
 
 Datum
@@ -392,11 +391,12 @@ spherecircle_circ(PG_FUNCTION_ARGS)
 Datum
 spheretrans_circle(PG_FUNCTION_ARGS)
 {
-	SCIRCLE    *sc = (SCIRCLE *) PG_GETARG_POINTER(0);
+	SCIRCLE	   *sc = (SCIRCLE *) PG_GETARG_POINTER(0);
 	SEuler	   *se = (SEuler *) PG_GETARG_POINTER(1);
-	SCIRCLE    *out = (SCIRCLE *) palloc(sizeof(SCIRCLE));
+	SCIRCLE	   *out = (SCIRCLE *) palloc(sizeof(SCIRCLE));
 
-	PG_RETURN_POINTER(euler_scircle_trans(out, sc, se));
+	euler_scircle_trans(out, sc, se);
+	PG_RETURN_POINTER(out);
 }
 
 Datum

circle.h

@@ -3,155 +3,155 @@
 
 #include "euler.h"
 
- /*
-  * Spherical circle declarations
-  */
+/*
+ * Spherical circle declarations
+ */
 
- /*
-  * Spherical circle data structure: center and radius.
-  */
+/*
+ * Spherical circle data structure: center and radius.
+ */
 typedef struct
 {
 	SPoint		center; /* the center of circle */
 	float8		radius; /* the circle radius in radians */
 } SCIRCLE;
 
- /*
-  * Checks whether two circles are equal.
-  */
+/*
+ * Checks whether two circles are equal.
+ */
 bool		scircle_eq(const SCIRCLE *c1, const SCIRCLE *c2);
 
- /*
-  * Checks whether circle contains point.
-  */
+/*
+ * Checks whether circle contains point.
+ */
 bool		spoint_in_circle(const SPoint *p, const SCIRCLE *c);
 
- /*
-  * Transforms a circle using Euler transformation.
-  */
-SCIRCLE    *euler_scircle_trans(SCIRCLE *out, const SCIRCLE *in, const SEuler *se);
+/*
+ * Transforms a circle using Euler transformation.
+ */
+void		euler_scircle_trans(SCIRCLE *out, const SCIRCLE *in, const SEuler *se);
 
- /*
-  * Takes the input and stores it as spherical circle.
-  */
+/*
+ * Takes the input and stores it as spherical circle.
+ */
 Datum		spherecircle_in(PG_FUNCTION_ARGS);
 
- /*
-  * Checks whether two circles are equal.
-  */
+/*
+ * Checks whether two circles are equal.
+ */
 Datum		spherecircle_equal(PG_FUNCTION_ARGS);
 
- /*
-  * Checks whether two circles are not equal.
-  */
+/*
+ * Checks whether two circles are not equal.
+ */
 Datum		spherecircle_equal_neg(PG_FUNCTION_ARGS);
 
- /*
-  * Calculate the distance of two circles. If overlapping, this function
-  * returns 0.0.
-  */
+/*
+ * Calculate the distance of two circles. If overlapping, this function
+ * returns 0.0.
+ */
 Datum		spherecircle_distance(PG_FUNCTION_ARGS);
 
- /*
-  * Calculate the distance of circle and point. If circle contains point,
-  * this function returns 0.0.
-  */
+/*
+ * Calculate the distance of circle and point. If circle contains point,
+ * this function returns 0.0.
+ */
 Datum		spherecircle_point_distance(PG_FUNCTION_ARGS);
 
- /*
-  * Calculate the distance of point and circle. If circle contains point,
-  * this function returns 0.0.
-  */
+/*
+ * Calculate the distance of point and circle. If circle contains point,
+ * this function returns 0.0.
+ */
 Datum		spherecircle_point_distance_com(PG_FUNCTION_ARGS);
 
- /*
-  * Checks whether circle contains point.
-  */
+/*
+ * Checks whether circle contains point.
+ */
 Datum		spherepoint_in_circle(PG_FUNCTION_ARGS);
 
- /*
-  * Checks whether circle doesn't contain point.
-  */
+/*
+ * Checks whether circle doesn't contain point.
+ */
 Datum		spherepoint_in_circle_neg(PG_FUNCTION_ARGS);
 
- /*
-  * Checks whether circle contains point.
-  */
+/*
+ * Checks whether circle contains point.
+ */
 Datum		spherepoint_in_circle_com(PG_FUNCTION_ARGS);
 
- /*
-  * Checks whether circle doesn't contain point.
-  */
+/*
+ * Checks whether circle doesn't contain point.
+ */
 Datum		spherepoint_in_circle_com_neg(PG_FUNCTION_ARGS);
 
- /*
-  * Checks whether circle is contained by other circle.
-  */
+/*
+ * Checks whether circle is contained by other circle.
+ */
 Datum		spherecircle_in_circle(PG_FUNCTION_ARGS);
 
- /*
-  * Checks whether circle is not contained by other circle.
-  */
+/*
+ * Checks whether circle is not contained by other circle.
+ */
 Datum		spherecircle_in_circle_neg(PG_FUNCTION_ARGS);
 
- /*
-  * Checks whether circle contains other circle.
-  */
+/*
+ * Checks whether circle contains other circle.
+ */
 Datum		spherecircle_in_circle_com(PG_FUNCTION_ARGS);
 
- /*
-  * Checks whether circle does not contain other circle.
-  */
+/*
+ * Checks whether circle does not contain other circle.
+ */
 Datum		spherecircle_in_circle_com_neg(PG_FUNCTION_ARGS);
 
- /*
-  * Checks whether two circle overlap.
-  */
+/*
+ * Checks whether two circle overlap.
+ */
 Datum		spherecircle_overlap(PG_FUNCTION_ARGS);
 
- /*
-  * Checks whether two circle overlap.
-  */
+/*
+ * Checks whether two circle overlap.
+ */
 Datum		spherecircle_overlap_neg(PG_FUNCTION_ARGS);
 
- /*
-  * Returns the center of circle.
-  */
+/*
+ * Returns the center of circle.
+ */
 Datum		spherecircle_center(PG_FUNCTION_ARGS);
 
- /*
-  * Returns the radius of circle.
-  */
+/*
+ * Returns the radius of circle.
+ */
 Datum		spherecircle_radius(PG_FUNCTION_ARGS);
 
- /*
-  * Converts a point to a circle.
-  */
+/*
+ * Converts a point to a circle.
+ */
 Datum		spherepoint_to_circle(PG_FUNCTION_ARGS);
 
- /*
-  * Creates a circle from center and radius.
-  */
+/*
+ * Creates a circle from center and radius.
+ */
 Datum		spherecircle_by_center(PG_FUNCTION_ARGS);
 
- /*
-  * Calculates the area of a circle in square radians.
-  */
+/*
+ * Calculates the area of a circle in square radians.
+ */
 Datum		spherecircle_area(PG_FUNCTION_ARGS);
 
- /*
-  * Calculates the circumference of a circle in radians.
-  */
+/*
+ * Calculates the circumference of a circle in radians.
+ */
 Datum		spherecircle_circ(PG_FUNCTION_ARGS);
 
- /*
-  * Transforms a circle using Euler transformation.
-  */
+/*
+ * Transforms a circle using Euler transformation.
+ */
 Datum		spheretrans_circle(PG_FUNCTION_ARGS);
 
- /*
-  * Inverse transformation of a circle using Euler transformation.
-  */
+/*
+ * Inverse transformation of a circle using Euler transformation.
+ */
 Datum		spheretrans_circle_inverse(PG_FUNCTION_ARGS);
 
 #endif