Pgindent run for 8.0.

1 files changed, 101 insertions, 90 deletions

diff --git a/contrib/btree_gist/btree_macaddr.c b/contrib/btree_gist/btree_macaddr.c
index b6e9c672f1d..3f08a586556 100644
--- a/contrib/btree_gist/btree_macaddr.c
+++ b/contrib/btree_gist/btree_macaddr.c
@@ -5,9 +5,9 @@
 
 typedef struct
 {
-   macaddr    lower;
-   macaddr    upper;
-}  macKEY;
+	macaddr		lower;
+	macaddr		upper;
+}	macKEY;
 
 /*
 ** OID ops
@@ -19,62 +19,67 @@ PG_FUNCTION_INFO_V1(gbt_macad_consistent);
 PG_FUNCTION_INFO_V1(gbt_macad_penalty);
 PG_FUNCTION_INFO_V1(gbt_macad_same);
 
-Datum    gbt_macad_compress(PG_FUNCTION_ARGS);
-Datum    gbt_macad_union(PG_FUNCTION_ARGS);
-Datum    gbt_macad_picksplit(PG_FUNCTION_ARGS);
-Datum    gbt_macad_consistent(PG_FUNCTION_ARGS);
-Datum    gbt_macad_penalty(PG_FUNCTION_ARGS);
-Datum    gbt_macad_same(PG_FUNCTION_ARGS);
+Datum		gbt_macad_compress(PG_FUNCTION_ARGS);
+Datum		gbt_macad_union(PG_FUNCTION_ARGS);
+Datum		gbt_macad_picksplit(PG_FUNCTION_ARGS);
+Datum		gbt_macad_consistent(PG_FUNCTION_ARGS);
+Datum		gbt_macad_penalty(PG_FUNCTION_ARGS);
+Datum		gbt_macad_same(PG_FUNCTION_ARGS);
 
 
-static bool     gbt_macadgt     (const void *a, const void *b)
+static bool
+gbt_macadgt(const void *a, const void *b)
 {
-  return DatumGetBool(DirectFunctionCall2(macaddr_gt,PointerGetDatum(a),PointerGetDatum(b)));
+	return DatumGetBool(DirectFunctionCall2(macaddr_gt, PointerGetDatum(a), PointerGetDatum(b)));
 }
-static bool     gbt_macadge     (const void *a, const void *b)
+static bool
+gbt_macadge(const void *a, const void *b)
 {
-  return DatumGetBool(DirectFunctionCall2(macaddr_ge,PointerGetDatum(a),PointerGetDatum(b)));
+	return DatumGetBool(DirectFunctionCall2(macaddr_ge, PointerGetDatum(a), PointerGetDatum(b)));
 }
 
-static bool     gbt_macadeq     (const void *a, const void *b)
+static bool
+gbt_macadeq(const void *a, const void *b)
 {
-  return DatumGetBool(DirectFunctionCall2(macaddr_eq,PointerGetDatum(a),PointerGetDatum(b)));
+	return DatumGetBool(DirectFunctionCall2(macaddr_eq, PointerGetDatum(a), PointerGetDatum(b)));
 }
 
-static bool     gbt_macadle     (const void *a, const void *b)
+static bool
+gbt_macadle(const void *a, const void *b)
 {
-  return DatumGetBool(DirectFunctionCall2(macaddr_le,PointerGetDatum(a),PointerGetDatum(b)));
+	return DatumGetBool(DirectFunctionCall2(macaddr_le, PointerGetDatum(a), PointerGetDatum(b)));
 }
 
-static bool     gbt_macadlt     (const void *a, const void *b)
+static bool
+gbt_macadlt(const void *a, const void *b)
 {
-  return DatumGetBool(DirectFunctionCall2(macaddr_lt,PointerGetDatum(a),PointerGetDatum(b)));
+	return DatumGetBool(DirectFunctionCall2(macaddr_lt, PointerGetDatum(a), PointerGetDatum(b)));
 }
 
 
 static int
 gbt_macadkey_cmp(const void *a, const void *b)
 {
-        return DatumGetInt32(
-            DirectFunctionCall2(
-              macaddr_cmp ,
-              PointerGetDatum (&((Nsrt *) a)->t[0]),
-              PointerGetDatum (&((Nsrt *) b)->t[0])
-            )
-        );
+	return DatumGetInt32(
+						 DirectFunctionCall2(
+											 macaddr_cmp,
+									PointerGetDatum(&((Nsrt *) a)->t[0]),
+									 PointerGetDatum(&((Nsrt *) b)->t[0])
+											 )
+		);
 }
 
 
-static const gbtree_ninfo tinfo = 
-{ 
-  gbt_t_macad,
-  sizeof(macaddr),
-  gbt_macadgt,
-  gbt_macadge,
-  gbt_macadeq,
-  gbt_macadle,
-  gbt_macadlt,
-  gbt_macadkey_cmp
+static const gbtree_ninfo tinfo =
+{
+	gbt_t_macad,
+	sizeof(macaddr),
+	gbt_macadgt,
+	gbt_macadge,
+	gbt_macadeq,
+	gbt_macadle,
+	gbt_macadlt,
+	gbt_macadkey_cmp
 };
 
 
@@ -84,14 +89,16 @@ static const gbtree_ninfo tinfo =
 
 
 
-static uint64 mac_2_uint64  ( macaddr * m ){
-   unsigned char * mi = ( unsigned char * ) m;
-   uint64    res = 0;
-   int i;
-   for (i=0; i<6; i++ ){
-     res += ( ( (uint64) mi[i] ) <<  ( (uint64) ( (5-i)*8 ) ) );
-   }
-   return res;
+static uint64
+mac_2_uint64(macaddr *m)
+{
+	unsigned char *mi = (unsigned char *) m;
+	uint64		res = 0;
+	int			i;
+
+	for (i = 0; i < 6; i++)
+		res += (((uint64) mi[i]) << ((uint64) ((5 - i) * 8)));
+	return res;
 }
 
 
@@ -99,9 +106,10 @@ static uint64 mac_2_uint64  ( macaddr * m ){
 Datum
 gbt_macad_compress(PG_FUNCTION_ARGS)
 {
-    GISTENTRY  *entry  = (GISTENTRY *) PG_GETARG_POINTER(0);
-    GISTENTRY  *retval = NULL;
-    PG_RETURN_POINTER( gbt_num_compress( retval , entry , &tinfo ));
+	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
+	GISTENTRY  *retval = NULL;
+
+	PG_RETURN_POINTER(gbt_num_compress(retval, entry, &tinfo));
 }
 
 
@@ -109,76 +117,79 @@ Datum
 gbt_macad_consistent(PG_FUNCTION_ARGS)
 {
 
-    GISTENTRY        *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-    macaddr          *query = (macaddr *) PG_GETARG_POINTER(1);
-    macKEY             *kkk = (macKEY *) DatumGetPointer(entry->key);
-    GBT_NUMKEY_R        key ;
-    StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-    key.lower = (GBT_NUMKEY*) &kkk->lower ;
-    key.upper = (GBT_NUMKEY*) &kkk->upper ;
-
-    PG_RETURN_BOOL( 
-      gbt_num_consistent( &key, (void*)query,&strategy,GIST_LEAF(entry),&tinfo)
-    );
+	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
+	macaddr    *query = (macaddr *) PG_GETARG_POINTER(1);
+	macKEY	   *kkk = (macKEY *) DatumGetPointer(entry->key);
+	GBT_NUMKEY_R key;
+	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
+
+	key.lower = (GBT_NUMKEY *) & kkk->lower;
+	key.upper = (GBT_NUMKEY *) & kkk->upper;
+
+	PG_RETURN_BOOL(
+				   gbt_num_consistent(&key, (void *) query, &strategy, GIST_LEAF(entry), &tinfo)
+		);
 }
 
 
 Datum
 gbt_macad_union(PG_FUNCTION_ARGS)
 {
-    GistEntryVector     *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
-    void                     *out = palloc(sizeof(macKEY));
-    *(int *) PG_GETARG_POINTER(1) = sizeof(macKEY);
-    PG_RETURN_POINTER( gbt_num_union ( (void*)out, entryvec, &tinfo ) );
+	GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
+	void	   *out = palloc(sizeof(macKEY));
+
+	*(int *) PG_GETARG_POINTER(1) = sizeof(macKEY);
+	PG_RETURN_POINTER(gbt_num_union((void *) out, entryvec, &tinfo));
 }
 
 
 Datum
 gbt_macad_penalty(PG_FUNCTION_ARGS)
 {
-        macKEY    *origentry = (macKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
-        macKEY    *newentry  = (macKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
-        float      *result   = (float *) PG_GETARG_POINTER(2);
-        uint64     iorg[2], inew[2];
-        uint64     res;
+	macKEY	   *origentry = (macKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
+	macKEY	   *newentry = (macKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
+	float	   *result = (float *) PG_GETARG_POINTER(2);
+	uint64		iorg[2],
+				inew[2];
+	uint64		res;
 
-        iorg[0] =  mac_2_uint64 ( &origentry->lower );
-        iorg[1] =  mac_2_uint64 ( &origentry->upper );
-        inew[0] =  mac_2_uint64 ( &newentry->lower  );
-        inew[1] =  mac_2_uint64 ( &newentry->upper  );
+	iorg[0] = mac_2_uint64(&origentry->lower);
+	iorg[1] = mac_2_uint64(&origentry->upper);
+	inew[0] = mac_2_uint64(&newentry->lower);
+	inew[1] = mac_2_uint64(&newentry->upper);
 
-        penalty_range_enlarge ( iorg[0], iorg[1], inew[0], inew[1] );
+	penalty_range_enlarge(iorg[0], iorg[1], inew[0], inew[1]);
 
-        *result = 0.0;
+	*result = 0.0;
 
-        if ( res > 0 ){
-          *result += FLT_MIN ;
-          *result += (float) ( ( (double)res ) / ( (double)res + (double)iorg[1] - (double)iorg[0] ) );
-          *result *= ( FLT_MAX / ( ( (GISTENTRY *) PG_GETARG_POINTER(0))->rel->rd_att->natts + 1 ) );
-        }
+	if (res > 0)
+	{
+		*result += FLT_MIN;
+		*result += (float) (((double) res) / ((double) res + (double) iorg[1] - (double) iorg[0]));
+		*result *= (FLT_MAX / (((GISTENTRY *) PG_GETARG_POINTER(0))->rel->rd_att->natts + 1));
+	}
 
-        PG_RETURN_POINTER(result);
+	PG_RETURN_POINTER(result);
 
 }
 
 Datum
 gbt_macad_picksplit(PG_FUNCTION_ARGS)
 {
-  PG_RETURN_POINTER(gbt_num_picksplit(
-      (GistEntryVector *) PG_GETARG_POINTER(0),
-      (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
-      &tinfo
-  ));
+	PG_RETURN_POINTER(gbt_num_picksplit(
+								(GistEntryVector *) PG_GETARG_POINTER(0),
+								  (GIST_SPLITVEC *) PG_GETARG_POINTER(1),
+										&tinfo
+										));
 }
 
 Datum
 gbt_macad_same(PG_FUNCTION_ARGS)
 {
-  macKEY    *b1 = (macKEY *) PG_GETARG_POINTER(0);
-  macKEY    *b2 = (macKEY *) PG_GETARG_POINTER(1);
-  bool     *result = (bool *) PG_GETARG_POINTER(2);
+	macKEY	   *b1 = (macKEY *) PG_GETARG_POINTER(0);
+	macKEY	   *b2 = (macKEY *) PG_GETARG_POINTER(1);
+	bool	   *result = (bool *) PG_GETARG_POINTER(2);
 
-  *result  = gbt_num_same ( (void*)b1, (void*)b2, &tinfo );
-  PG_RETURN_POINTER(result);
+	*result = gbt_num_same((void *) b1, (void *) b2, &tinfo);
+	PG_RETURN_POINTER(result);
 }
-