Pgindent run for 8.0.

1 files changed, 119 insertions, 110 deletions

diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index 5b3f66789de..fad053a36f7 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -6,9 +6,9 @@
 
 typedef struct inetkey
 {
-   double    lower;
-   double    upper;
-}  inetKEY;
+	double		lower;
+	double		upper;
+}	inetKEY;
 
 /*
 ** inet ops
@@ -22,62 +22,65 @@ PG_FUNCTION_INFO_V1(gbt_cidr_consistent);
 PG_FUNCTION_INFO_V1(gbt_inet_penalty);
 PG_FUNCTION_INFO_V1(gbt_inet_same);
 
-Datum    gbt_inet_compress(PG_FUNCTION_ARGS);
-Datum    gbt_cidr_compress(PG_FUNCTION_ARGS);
-Datum    gbt_inet_union(PG_FUNCTION_ARGS);
-Datum    gbt_inet_picksplit(PG_FUNCTION_ARGS);
-Datum    gbt_inet_consistent(PG_FUNCTION_ARGS);
-Datum    gbt_cidr_consistent(PG_FUNCTION_ARGS);
-Datum    gbt_inet_penalty(PG_FUNCTION_ARGS);
-Datum    gbt_inet_same(PG_FUNCTION_ARGS);
+Datum		gbt_inet_compress(PG_FUNCTION_ARGS);
+Datum		gbt_cidr_compress(PG_FUNCTION_ARGS);
+Datum		gbt_inet_union(PG_FUNCTION_ARGS);
+Datum		gbt_inet_picksplit(PG_FUNCTION_ARGS);
+Datum		gbt_inet_consistent(PG_FUNCTION_ARGS);
+Datum		gbt_cidr_consistent(PG_FUNCTION_ARGS);
+Datum		gbt_inet_penalty(PG_FUNCTION_ARGS);
+Datum		gbt_inet_same(PG_FUNCTION_ARGS);
 
 
-static bool     gbt_inetgt     (const void *a, const void *b)
+static bool
+gbt_inetgt(const void *a, const void *b)
 {
-  return ( *((double*)a) >  *((double*)b) ); 
+	return (*((double *) a) > *((double *) b));
 }
-static bool     gbt_inetge     (const void *a, const void *b)
+static bool
+gbt_inetge(const void *a, const void *b)
 {
-  return ( *((double*)a) >= *((double*)b) ); 
+	return (*((double *) a) >= *((double *) b));
 }
-static bool     gbt_ineteq     (const void *a, const void *b)
+static bool
+gbt_ineteq(const void *a, const void *b)
 {
-  return ( *((double*)a) == *((double*)b) ); 
+	return (*((double *) a) == *((double *) b));
 }
-static bool     gbt_inetle     (const void *a, const void *b)
+static bool
+gbt_inetle(const void *a, const void *b)
 {
-  return ( *((double*)a) <= *((double*)b) ); 
+	return (*((double *) a) <= *((double *) b));
 }
-static bool     gbt_inetlt     (const void *a, const void *b)
+static bool
+gbt_inetlt(const void *a, const void *b)
 {
-  return ( *((double*)a) <  *((double*)b) ); 
+	return (*((double *) a) < *((double *) b));
 }
 
 static int
 gbt_inetkey_cmp(const void *a, const void *b)
 {
 
-  if ( *(double*)(&((Nsrt *) a)->t[0]) >  *(double*)(&((Nsrt *) b)->t[0]) ){
-    return 1;
-  } else
-  if ( *(double*)(&((Nsrt *) a)->t[0]) <  *(double*)(&((Nsrt *) b)->t[0]) ){
-    return -1;
-  }
-  return  0;
+	if (*(double *) (&((Nsrt *) a)->t[0]) > *(double *) (&((Nsrt *) b)->t[0]))
+		return 1;
+	else if (*(double *) (&((Nsrt *) a)->t[0]) < *(double *) (&((Nsrt *) b)->t[0]))
+		return -1;
+	return 0;
 
 }
 
 
-static const gbtree_ninfo tinfo = 
+static const gbtree_ninfo tinfo =
 {
-  gbt_t_inet,
-  sizeof(double),
-  gbt_inetgt,
-  gbt_inetge,
-  gbt_ineteq,
-  gbt_inetle,
-  gbt_inetlt,
-  gbt_inetkey_cmp
+	gbt_t_inet,
+	sizeof(double),
+	gbt_inetgt,
+	gbt_inetge,
+	gbt_ineteq,
+	gbt_inetle,
+	gbt_inetlt,
+	gbt_inetkey_cmp
 };
 
 
@@ -87,24 +90,25 @@ static const gbtree_ninfo tinfo =
 
 
 
-static GISTENTRY  *
-gbt_inet_compress_inetrnal(GISTENTRY  *retval , GISTENTRY  *entry , Oid typid)
+static GISTENTRY *
+gbt_inet_compress_inetrnal(GISTENTRY *retval, GISTENTRY *entry, Oid typid)
 {
-  
-  if (entry->leafkey)
-  {
-    inetKEY  *r = (inetKEY *) palloc(sizeof(inetKEY));
-    retval   = palloc(sizeof(GISTENTRY));
-    r->lower = convert_network_to_scalar(entry->key, typid );
-    r->upper = r->lower ;
-    gistentryinit(*retval, PointerGetDatum(r),
-         entry->rel, entry->page,
-         entry->offset, sizeof(inetKEY), FALSE);
-  }
-  else
-        retval = entry;
 
-  return ( retval );
+	if (entry->leafkey)
+	{
+		inetKEY    *r = (inetKEY *) palloc(sizeof(inetKEY));
+
+		retval = palloc(sizeof(GISTENTRY));
+		r->lower = convert_network_to_scalar(entry->key, typid);
+		r->upper = r->lower;
+		gistentryinit(*retval, PointerGetDatum(r),
+					  entry->rel, entry->page,
+					  entry->offset, sizeof(inetKEY), FALSE);
+	}
+	else
+		retval = entry;
+
+	return (retval);
 }
 
 
@@ -112,113 +116,118 @@ gbt_inet_compress_inetrnal(GISTENTRY  *retval , GISTENTRY  *entry , Oid typid)
 Datum
 gbt_inet_compress(PG_FUNCTION_ARGS)
 {
-  GISTENTRY  *entry  = (GISTENTRY *) PG_GETARG_POINTER(0);
-  GISTENTRY  *retval = NULL;
-  PG_RETURN_POINTER( gbt_inet_compress_inetrnal(retval ,entry ,INETOID ) );
+	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
+	GISTENTRY  *retval = NULL;
+
+	PG_RETURN_POINTER(gbt_inet_compress_inetrnal(retval, entry, INETOID));
 }
 
 Datum
 gbt_cidr_compress(PG_FUNCTION_ARGS)
 {
-  GISTENTRY  *entry  = (GISTENTRY *) PG_GETARG_POINTER(0);
-  GISTENTRY  *retval = NULL;
-  PG_RETURN_POINTER( gbt_inet_compress_inetrnal(retval ,entry ,CIDROID ) );
+	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
+	GISTENTRY  *retval = NULL;
+
+	PG_RETURN_POINTER(gbt_inet_compress_inetrnal(retval, entry, CIDROID));
 }
 
 
 static bool
-gbt_inet_consistent_internal (
-  const GISTENTRY * entry,
-  const double    * query,
-  const StrategyNumber * strategy
-){
-    inetKEY            *kkk = (inetKEY *) DatumGetPointer(entry->key);
-    GBT_NUMKEY_R        key ;
+gbt_inet_consistent_internal(
+							 const GISTENTRY *entry,
+							 const double *query,
+							 const StrategyNumber *strategy
+)
+{
+	inetKEY    *kkk = (inetKEY *) DatumGetPointer(entry->key);
+	GBT_NUMKEY_R key;
+
+	key.lower = (GBT_NUMKEY *) & kkk->lower;
+	key.upper = (GBT_NUMKEY *) & kkk->upper;
 
-    key.lower = (GBT_NUMKEY*) &kkk->lower ;
-    key.upper = (GBT_NUMKEY*) &kkk->upper ;
-        
-    return (
-      gbt_num_consistent( &key, (void*)query,strategy,GIST_LEAF(entry),&tinfo)
-    );
+	return (
+			gbt_num_consistent(&key, (void *) query, strategy, GIST_LEAF(entry), &tinfo)
+		);
 }
 
 
 Datum
 gbt_inet_consistent(PG_FUNCTION_ARGS)
 {
-    GISTENTRY        *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-    double            query = convert_network_to_scalar( PG_GETARG_DATUM(1) ,INETOID );
-    StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
+	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
+	double		query = convert_network_to_scalar(PG_GETARG_DATUM(1), INETOID);
+	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
 
-    PG_RETURN_BOOL(
-       gbt_inet_consistent_internal ( entry, &query, &strategy )
-    );
+	PG_RETURN_BOOL(
+				   gbt_inet_consistent_internal(entry, &query, &strategy)
+		);
 }
 
 Datum
 gbt_cidr_consistent(PG_FUNCTION_ARGS)
 {
-    GISTENTRY        *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-    double            query = convert_network_to_scalar( PG_GETARG_DATUM(1) ,CIDROID );
-    StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
+	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
+	double		query = convert_network_to_scalar(PG_GETARG_DATUM(1), CIDROID);
+	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
 
-    PG_RETURN_BOOL(
-       gbt_inet_consistent_internal ( entry, &query, &strategy )
-    );
+	PG_RETURN_BOOL(
+				   gbt_inet_consistent_internal(entry, &query, &strategy)
+		);
 }
 
 
 Datum
 gbt_inet_union(PG_FUNCTION_ARGS)
 {
-    GistEntryVector     *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
-    void                     *out = palloc(sizeof(inetKEY));
-    *(int *) PG_GETARG_POINTER(1) = sizeof(inetKEY);
-    PG_RETURN_POINTER( gbt_num_union ( (void*)out, entryvec, &tinfo ) );
+	GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
+	void	   *out = palloc(sizeof(inetKEY));
+
+	*(int *) PG_GETARG_POINTER(1) = sizeof(inetKEY);
+	PG_RETURN_POINTER(gbt_num_union((void *) out, entryvec, &tinfo));
 }
 
 
 Datum
 gbt_inet_penalty(PG_FUNCTION_ARGS)
 {
-  inetKEY    *origentry = (inetKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
-  inetKEY    *newentry  = (inetKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
-  float         *result = (float *) PG_GETARG_POINTER(2);
+	inetKEY    *origentry = (inetKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
+	inetKEY    *newentry = (inetKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
+	float	   *result = (float *) PG_GETARG_POINTER(2);
 
-  double            res ;
+	double		res;
 
-  *result = 0.0;
+	*result = 0.0;
 
-  penalty_range_enlarge ( origentry->lower, origentry->upper, newentry->lower, newentry->upper );
+	penalty_range_enlarge(origentry->lower, origentry->upper, newentry->lower, newentry->upper);
 
-  if ( res > 0 ){
-    *result += FLT_MIN ;
-    *result += (float) ( res / ( (double) ( res + origentry->upper - origentry->lower ) ) );
-    *result *= ( FLT_MAX / ( ( (GISTENTRY *) PG_GETARG_POINTER(0))->rel->rd_att->natts + 1 ) );
-  }
+	if (res > 0)
+	{
+		*result += FLT_MIN;
+		*result += (float) (res / ((double) (res + origentry->upper - origentry->lower)));
+		*result *= (FLT_MAX / (((GISTENTRY *) PG_GETARG_POINTER(0))->rel->rd_att->natts + 1));
+	}
 
-  PG_RETURN_POINTER(result);
+	PG_RETURN_POINTER(result);
 
 }
 
 Datum
 gbt_inet_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_inet_same(PG_FUNCTION_ARGS)
 {
-  inetKEY    *b1 = (inetKEY *) PG_GETARG_POINTER(0);
-  inetKEY    *b2 = (inetKEY *) PG_GETARG_POINTER(1);
-  bool     *result = (bool *) PG_GETARG_POINTER(2);
+	inetKEY    *b1 = (inetKEY *) PG_GETARG_POINTER(0);
+	inetKEY    *b2 = (inetKEY *) 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);
 }