pgindent run before PG 9.1 beta 1.

1 files changed, 18 insertions, 18 deletions

diff --git a/src/backend/executor/nodeMergeAppend.c b/src/backend/executor/nodeMergeAppend.c
index 73920f21c8c..4ebe0cbe033 100644
--- a/src/backend/executor/nodeMergeAppend.c
+++ b/src/backend/executor/nodeMergeAppend.c
@@ -48,8 +48,8 @@
  * contains integers which index into the slots array. These typedefs try to
  * clear it up, but they're only documentation.
  */
-typedef int		SlotNumber;
-typedef int		HeapPosition;
+typedef int SlotNumber;
+typedef int HeapPosition;
 
 static void heap_insert_slot(MergeAppendState *node, SlotNumber new_slot);
 static void heap_siftup_slot(MergeAppendState *node);
@@ -128,13 +128,13 @@ ExecInitMergeAppend(MergeAppend *node, EState *estate, int eflags)
 	 * initialize sort-key information
 	 */
 	mergestate->ms_nkeys = node->numCols;
-	mergestate->ms_scankeys = palloc0(sizeof(ScanKeyData) *  node->numCols);
+	mergestate->ms_scankeys = palloc0(sizeof(ScanKeyData) * node->numCols);
 
 	for (i = 0; i < node->numCols; i++)
 	{
-		Oid		sortFunction;
-		bool	reverse;
-		int		flags;
+		Oid			sortFunction;
+		bool		reverse;
+		int			flags;
 
 		if (!get_compare_function_for_ordering_op(node->sortOperators[i],
 												  &sortFunction, &reverse))
@@ -187,8 +187,8 @@ ExecMergeAppend(MergeAppendState *node)
 	if (!node->ms_initialized)
 	{
 		/*
-		 * First time through: pull the first tuple from each subplan,
-		 * and set up the heap.
+		 * First time through: pull the first tuple from each subplan, and set
+		 * up the heap.
 		 */
 		for (i = 0; i < node->ms_nplans; i++)
 		{
@@ -243,7 +243,7 @@ heap_insert_slot(MergeAppendState *node, SlotNumber new_slot)
 	j = node->ms_heap_size++;	/* j is where the "hole" is */
 	while (j > 0)
 	{
-		int		i = (j-1)/2;
+		int			i = (j - 1) / 2;
 
 		if (heap_compare_slots(node, new_slot, node->ms_heap[i]) >= 0)
 			break;
@@ -269,11 +269,11 @@ heap_siftup_slot(MergeAppendState *node)
 	i = 0;						/* i is where the "hole" is */
 	for (;;)
 	{
-		int		j = 2 * i + 1;
+		int			j = 2 * i + 1;
 
 		if (j >= n)
 			break;
-		if (j+1 < n && heap_compare_slots(node, heap[j], heap[j+1]) > 0)
+		if (j + 1 < n && heap_compare_slots(node, heap[j], heap[j + 1]) > 0)
 			j++;
 		if (heap_compare_slots(node, heap[n], heap[j]) <= 0)
 			break;
@@ -298,13 +298,13 @@ heap_compare_slots(MergeAppendState *node, SlotNumber slot1, SlotNumber slot2)
 
 	for (nkey = 0; nkey < node->ms_nkeys; nkey++)
 	{
-		ScanKey scankey = node->ms_scankeys + nkey;
-		AttrNumber attno = scankey->sk_attno;
-		Datum	datum1,
-				datum2;
-		bool	isNull1,
-				isNull2;
-		int32	compare;
+		ScanKey		scankey = node->ms_scankeys + nkey;
+		AttrNumber	attno = scankey->sk_attno;
+		Datum		datum1,
+					datum2;
+		bool		isNull1,
+					isNull2;
+		int32		compare;
 
 		datum1 = slot_getattr(s1, attno, &isNull1);
 		datum2 = slot_getattr(s2, attno, &isNull2);