Make 0x007f -> (unsigned)0x7f to make pgindent happy.

15 files changed, 70 insertions, 63 deletions

diff --git a/contrib/os2client/config.h b/contrib/os2client/config.h
index 872b34a656..ad492fb7d6 100644
--- a/contrib/os2client/config.h
+++ b/contrib/os2client/config.h
@@ -11,7 +11,7 @@
  * DEF_PGPORT is the TCP port number on which the Postmaster listens by
  * default.  This can be overriden by command options, environment variables,
  * and the postconfig hook. (set by build script)
-  */

+   */

 

 #define DEF_PGPORT "5432"

 

diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index e948cd0644..7a224b2f6a 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -68,6 +68,7 @@ _bt_doinsert(Relation rel, BTItem btitem, bool index_is_unique, Relation heapRel
 	LockBuffer(buf, BT_WRITE);
 
 l1:
+
 	/*
 	 * If the page was split between the time that we surrendered our read
 	 * lock and acquired our write lock, then this page may no longer be
@@ -96,13 +97,13 @@ l1:
 		/* key on the page before trying to compare it */
 		if (!PageIsEmpty(page) && offset <= maxoff)
 		{
-			TupleDesc		itupdesc;
-			BTItem			cbti;
-			HeapTupleData	htup;
-			BTPageOpaque 	opaque;
-			Buffer			nbuf;
-			BlockNumber 	nblkno;
-			bool			chtup = true;
+			TupleDesc	itupdesc;
+			BTItem		cbti;
+			HeapTupleData htup;
+			BTPageOpaque opaque;
+			Buffer		nbuf;
+			BlockNumber nblkno;
+			bool		chtup = true;
 
 			itupdesc = RelationGetDescr(rel);
 			nbuf = InvalidBuffer;
@@ -155,7 +156,7 @@ l1:
 						_bt_relbuf(rel, buf, BT_WRITE);
 						XactLockTableWait(xwait);
 						buf = _bt_getbuf(rel, blkno, BT_WRITE);
-						goto l1;	/* continue from the begin */
+						goto l1;/* continue from the begin */
 					}
 					elog(ERROR, "Cannot insert a duplicate key into a unique index");
 				}
@@ -178,7 +179,7 @@ l1:
 					nblkno = opaque->btpo_next;
 					if (nbuf != InvalidBuffer)
 						_bt_relbuf(rel, nbuf, BT_READ);
-					for (nbuf = InvalidBuffer; ; )
+					for (nbuf = InvalidBuffer;;)
 					{
 						nbuf = _bt_getbuf(rel, nblkno, BT_READ);
 						page = BufferGetPage(nbuf);
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 80c778a329..da6146f18d 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -315,9 +315,10 @@ _bt_getbuf(Relation rel, BlockNumber blkno, int access)
 	}
 	else
 	{
+
 		/*
-		 * Extend bufmgr code is unclean and so we have to
-		 * use locking here.
+		 * Extend bufmgr code is unclean and so we have to use locking
+		 * here.
 		 */
 		LockPage(rel, 0, ExclusiveLock);
 		buf = ReadBuffer(rel, blkno);
@@ -416,7 +417,7 @@ _bt_metaproot(Relation rel, BlockNumber rootbknum, int level)
 	Assert(metaopaque->btpo_flags & BTP_META);
 	metad = BTPageGetMeta(metap);
 	metad->btm_root = rootbknum;
-	if (level == 0)						/* called from _do_insert */
+	if (level == 0)				/* called from _do_insert */
 		metad->btm_level += 1;
 	else
 		metad->btm_level = level;		/* called from btsort */
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 7654b868b2..4b472d0c5e 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -402,9 +402,9 @@ btgettuple(IndexScanDesc scan, ScanDirection dir)
 	else
 		res = _bt_first(scan, dir);
 
-	/* 
-	 * Save heap TID to use it in _bt_restscan.
-	 * Unlock buffer before leaving index !
+	/*
+	 * Save heap TID to use it in _bt_restscan. Unlock buffer before
+	 * leaving index !
 	 */
 	if (res)
 	{
@@ -565,7 +565,7 @@ btmarkpos(IndexScanDesc scan)
 	if (ItemPointerIsValid(&(scan->currentItemData)))
 	{
 		so->btso_mrkbuf = ReadBuffer(scan->relation,
-									 BufferGetBlockNumber(so->btso_curbuf));
+								  BufferGetBlockNumber(so->btso_curbuf));
 		scan->currentMarkData = scan->currentItemData;
 		so->mrkHeapIptr = so->curHeapIptr;
 	}
@@ -594,7 +594,7 @@ btrestrpos(IndexScanDesc scan)
 	if (ItemPointerIsValid(&(scan->currentMarkData)))
 	{
 		so->btso_curbuf = ReadBuffer(scan->relation,
-									 BufferGetBlockNumber(so->btso_mrkbuf));
+								  BufferGetBlockNumber(so->btso_mrkbuf));
 
 		scan->currentItemData = scan->currentMarkData;
 		so->curHeapIptr = so->mrkHeapIptr;
@@ -628,6 +628,7 @@ _bt_restscan(IndexScanDesc scan)
 	BlockNumber blkno;
 
 	LockBuffer(buf, BT_READ);
+
 	/*
 	 * We use this as flag when first index tuple on page is deleted but
 	 * we do not move left (this would slowdown vacuum) - so we set
diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c
index ff6f3c68ea..ca2b3c8214 100644
--- a/src/backend/access/nbtree/nbtscan.c
+++ b/src/backend/access/nbtree/nbtscan.c
@@ -133,9 +133,10 @@ _bt_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno)
 			ItemPointerSetInvalid(&(so->curHeapIptr));
 		else
 		{
-			/* 
-			 * We have to lock buffer before _bt_step 
-			 * and unlock it after that.
+
+			/*
+			 * We have to lock buffer before _bt_step and unlock it after
+			 * that.
 			 */
 			LockBuffer(buf, BT_READ);
 			_bt_step(scan, &buf, BackwardScanDirection);
diff --git a/src/backend/optimizer/path/_deadcode/predmig.c b/src/backend/optimizer/path/_deadcode/predmig.c
index 4c1623681f..7643021495 100644
--- a/src/backend/optimizer/path/_deadcode/predmig.c
+++ b/src/backend/optimizer/path/_deadcode/predmig.c
@@ -487,7 +487,7 @@ xfunc_form_groups(Query *queryInfo, Stream root, Stream bottom)
 }
 
 
-/* -------------------				 UTILITY FUNCTIONS	   ------------------------- */
+/* -------------------				   UTILITY FUNCTIONS	 ------------------------- */
 
 /*
  ** xfunc_free_stream
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 47292ee18a..ff7d2c55b7 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -1187,7 +1187,7 @@ A_Expr_to_Expr(Node *ptr, bool *intersect_present)
 				break;
 			}
 		default:
-				result = ptr;
+			result = ptr;
 	}
 	return result;
 }
diff --git a/src/backend/storage/buffer/s_lock.c b/src/backend/storage/buffer/s_lock.c
index a8d5ea6960..faeffc0feb 100644
--- a/src/backend/storage/buffer/s_lock.c
+++ b/src/backend/storage/buffer/s_lock.c
@@ -100,7 +100,7 @@ s_lock(volatile slock_t *lock, const char *file, const int line)
 
 #if defined(__m68k__)
 static void
-			tas_dummy()			/* really means: extern int tas(slock_t
+tas_dummy()						/* really means: extern int tas(slock_t
 								 * **lock); */
 {
 	__asm__("		\n\
diff --git a/src/backend/tioga/tgRecipe.h b/src/backend/tioga/tgRecipe.h
index 5cb7030241..1a808000c6 100644
--- a/src/backend/tioga/tgRecipe.h
+++ b/src/backend/tioga/tgRecipe.h
@@ -36,6 +36,7 @@ typedef struct
 								 *
 								 *
 								 *
+								 *
 								 * geo-decls.h */
 
 #endif	 /* TIOGA_FRONTEND */
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index c4eacca891..ef0a5ecbc9 100644
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -2506,10 +2506,10 @@ add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
 			switch (cmp_abs(var1, var2))
 			{
 				case 0: /* ----------
-								 * ABS(var1) == ABS(var2)
-								 * result = ZERO
-								 * ----------
-								 */
+										 * ABS(var1) == ABS(var2)
+										 * result = ZERO
+										 * ----------
+										 */
 					digitbuf_free(result->buf);
 					result->buf = digitbuf_alloc(0);
 					result->ndigits = 0;
@@ -2522,10 +2522,10 @@ add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
 					break;
 
 				case 1: /* ----------
-								 * ABS(var1) > ABS(var2)
-								 * result = +(ABS(var1) - ABS(var2))
-								 * ----------
-								 */
+										 * ABS(var1) > ABS(var2)
+										 * result = +(ABS(var1) - ABS(var2))
+										 * ----------
+										 */
 					sub_abs(var1, var2, result);
 					result->sign = NUMERIC_POS;
 					break;
@@ -2553,10 +2553,10 @@ add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
 			switch (cmp_abs(var1, var2))
 			{
 				case 0: /* ----------
-								 * ABS(var1) == ABS(var2)
-								 * result = ZERO
-								 * ----------
-								 */
+										 * ABS(var1) == ABS(var2)
+										 * result = ZERO
+										 * ----------
+										 */
 					digitbuf_free(result->buf);
 					result->buf = digitbuf_alloc(0);
 					result->ndigits = 0;
@@ -2569,10 +2569,10 @@ add_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
 					break;
 
 				case 1: /* ----------
-								 * ABS(var1) > ABS(var2)
-								 * result = -(ABS(var1) - ABS(var2))
-								 * ----------
-								 */
+										 * ABS(var1) > ABS(var2)
+										 * result = -(ABS(var1) - ABS(var2))
+										 * ----------
+										 */
 					sub_abs(var1, var2, result);
 					result->sign = NUMERIC_NEG;
 					break;
@@ -2637,10 +2637,10 @@ sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
 			switch (cmp_abs(var1, var2))
 			{
 				case 0: /* ----------
-								 * ABS(var1) == ABS(var2)
-								 * result = ZERO
-								 * ----------
-								 */
+										 * ABS(var1) == ABS(var2)
+										 * result = ZERO
+										 * ----------
+										 */
 					digitbuf_free(result->buf);
 					result->buf = digitbuf_alloc(0);
 					result->ndigits = 0;
@@ -2653,10 +2653,10 @@ sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
 					break;
 
 				case 1: /* ----------
-								 * ABS(var1) > ABS(var2)
-								 * result = +(ABS(var1) - ABS(var2))
-								 * ----------
-								 */
+										 * ABS(var1) > ABS(var2)
+										 * result = +(ABS(var1) - ABS(var2))
+										 * ----------
+										 */
 					sub_abs(var1, var2, result);
 					result->sign = NUMERIC_POS;
 					break;
@@ -2684,10 +2684,10 @@ sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
 			switch (cmp_abs(var1, var2))
 			{
 				case 0: /* ----------
-								 * ABS(var1) == ABS(var2)
-								 * result = ZERO
-								 * ----------
-								 */
+										 * ABS(var1) == ABS(var2)
+										 * result = ZERO
+										 * ----------
+										 */
 					digitbuf_free(result->buf);
 					result->buf = digitbuf_alloc(0);
 					result->ndigits = 0;
@@ -2700,10 +2700,10 @@ sub_var(NumericVar * var1, NumericVar * var2, NumericVar * result)
 					break;
 
 				case 1: /* ----------
-								 * ABS(var1) > ABS(var2)
-								 * result = -(ABS(var1) - ABS(var2))
-								 * ----------
-								 */
+										 * ABS(var1) > ABS(var2)
+										 * result = -(ABS(var1) - ABS(var2))
+										 * ----------
+										 */
 					sub_abs(var1, var2, result);
 					result->sign = NUMERIC_NEG;
 					break;
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 5f3c5e4f36..e259fe733b 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -1394,7 +1394,7 @@ get_rule_expr(QryHier * qh, int rt_index, Node *node, bool varprefix)
 			break;
 
 		case T_SubLink:
-				return get_sublink_expr(qh, rt_index, node, varprefix);
+			return get_sublink_expr(qh, rt_index, node, varprefix);
 			break;
 
 		case T_Const:
diff --git a/src/backend/utils/mb/big5.c b/src/backend/utils/mb/big5.c
index bf8afff6b0..8e5abede3c 100644
--- a/src/backend/utils/mb/big5.c
+++ b/src/backend/utils/mb/big5.c
@@ -218,7 +218,7 @@ static unsigned short BinarySearchRange
 		{
 			if (0 == array[mid].peer)
 				return 0;
-			if (code >= 0xa140 U)
+			if (code >= (unsigned)0xa140)
 			{
 				/* big5 to cns */
 				tmp = ((code & 0xff00) - (array[mid].code & 0xff00)) >> 8;
@@ -292,7 +292,7 @@ BIG5toCNS(unsigned short big5, unsigned char *lc)
 	unsigned short cns = 0;
 	int			i;
 
-	if (big5 < 0xc940 U)
+	if (big5 < (unsigned)0xc940)
 	{
 		/* level 1 */
 
@@ -301,14 +301,14 @@ BIG5toCNS(unsigned short big5, unsigned char *lc)
 			if (b1c4[i][0] == big5)
 			{
 				*lc = LC_CNS11643_4;
-				return (b1c4[i][1] | 0x8080 U);
+				return (b1c4[i][1] | (unsigned)0x8080);
 			}
 		}
 
 		if (0 < (cns = BinarySearchRange(big5Level1ToCnsPlane1, 23, big5)))
 			*lc = LC_CNS11643_1;
 	}
-	else if (big5 == 0xc94a U)
+	else if (big5 == (unsigned)0xc94a)
 	{
 		/* level 2 */
 		*lc = LC_CNS11643_1;
diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c
index 1d2b749721..7ff62570fe 100644
--- a/src/backend/utils/mb/conv.c
+++ b/src/backend/utils/mb/conv.c
@@ -384,7 +384,7 @@ big52mic(unsigned char *big5, unsigned char *p, int len)
 
 	while (len > 0 && (c1 = *big5++))
 	{
-		if (c1 <= 0x007f U)
+		if (c1 <= (unsigned)0x7f)
 		{						/* ASCII */
 			len--;
 			*p++ = c1;
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index c65c66bd79..2e39da2e6f 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -19,7 +19,8 @@
 #include <storage/page.h>
 #include <access/funcindex.h>
 #include <access/itup.h>
-#include <storage/bufmgr.h>	/* don't remove, required by BT_READ/BT_WRITE */
+#include <storage/bufmgr.h>		/* don't remove, required by
+								 * BT_READ/BT_WRITE */
 #include <storage/itemptr.h>
 
 /*
diff --git a/src/include/access/strat.h b/src/include/access/strat.h
index d7fa619f32..4c4abbeb35 100644
--- a/src/include/access/strat.h
+++ b/src/include/access/strat.h
@@ -32,6 +32,7 @@ typedef struct StrategyTransformMapData
 								 *
 								 *
 								 *
+								 *
 								 * STRUCTURE */
 
 typedef StrategyTransformMapData *StrategyTransformMap;