From 22c5705f81717dd0622ebfb13a617e6104d1fbd9 Mon Sep 17 00:00:00 2001
From: Noah Misch <noah@leadboat.com>
Date: Sun, 11 Oct 2015 23:53:35 -0400
Subject: [PATCH] Use JsonbIteratorToken consistently in automatic variable
 declarations.

Many functions stored JsonbIteratorToken values in variables of other
integer types.  Also, standardize order relative to other declarations.
Expect compilers to generate the same code before and after this change.
---
 src/backend/utils/adt/jsonb.c      |  2 +-
 src/backend/utils/adt/jsonb_gin.c  | 10 +++++-----
 src/backend/utils/adt/jsonb_op.c   |  4 ++--
 src/backend/utils/adt/jsonb_util.c |  6 +++---
 src/backend/utils/adt/jsonfuncs.c  | 10 +++++-----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
index 1d65b251895..b8a37725738 100644
--- a/src/backend/utils/adt/jsonb.c
+++ b/src/backend/utils/adt/jsonb.c
@@ -372,8 +372,8 @@ JsonbToCString(StringInfo out, JsonbContainer *in, int estimated_len)
 {
 	bool		first = true;
 	JsonbIterator *it;
-	JsonbIteratorToken type = WJB_DONE;
 	JsonbValue	v;
+	JsonbIteratorToken type = WJB_DONE;
 	int			level = 0;
 	bool		redo_switch = false;
 
diff --git a/src/backend/utils/adt/jsonb_gin.c b/src/backend/utils/adt/jsonb_gin.c
index 069ee030803..86dbfdb4f23 100644
--- a/src/backend/utils/adt/jsonb_gin.c
+++ b/src/backend/utils/adt/jsonb_gin.c
@@ -70,8 +70,8 @@ gin_extract_jsonb(PG_FUNCTION_ARGS)
 	int			total = 2 * JB_ROOT_COUNT(jb);
 	JsonbIterator *it;
 	JsonbValue	v;
-	int			i = 0,
-				r;
+	JsonbIteratorToken r;
+	int			i = 0;
 	Datum	   *entries;
 
 	/* If the root level is empty, we certainly have no keys */
@@ -333,10 +333,10 @@ gin_extract_jsonb_path(PG_FUNCTION_ARGS)
 	int			total = 2 * JB_ROOT_COUNT(jb);
 	JsonbIterator *it;
 	JsonbValue	v;
+	JsonbIteratorToken r;
 	PathHashStack tail;
 	PathHashStack *stack;
-	int			i = 0,
-				r;
+	int			i = 0;
 	Datum	   *entries;
 
 	/* If the root level is empty, we certainly have no keys */
@@ -429,7 +429,7 @@ gin_extract_jsonb_path(PG_FUNCTION_ARGS)
 				stack = parent;
 				break;
 			default:
-				elog(ERROR, "invalid JsonbIteratorNext rc: %d", r);
+				elog(ERROR, "invalid JsonbIteratorNext rc: %d", (int) r);
 		}
 	}
 
diff --git a/src/backend/utils/adt/jsonb_op.c b/src/backend/utils/adt/jsonb_op.c
index d9aaac9ac27..17a4d271ec1 100644
--- a/src/backend/utils/adt/jsonb_op.c
+++ b/src/backend/utils/adt/jsonb_op.c
@@ -254,8 +254,8 @@ jsonb_hash(PG_FUNCTION_ARGS)
 {
 	Jsonb	   *jb = PG_GETARG_JSONB(0);
 	JsonbIterator *it;
-	int32		r;
 	JsonbValue	v;
+	JsonbIteratorToken r;
 	uint32		hash = 0;
 
 	if (JB_ROOT_COUNT(jb) == 0)
@@ -283,7 +283,7 @@ jsonb_hash(PG_FUNCTION_ARGS)
 			case WJB_END_OBJECT:
 				break;
 			default:
-				elog(ERROR, "invalid JsonbIteratorNext rc: %d", r);
+				elog(ERROR, "invalid JsonbIteratorNext rc: %d", (int) r);
 		}
 	}
 
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
index e94c4ccb0bb..0b526cb7268 100644
--- a/src/backend/utils/adt/jsonb_util.c
+++ b/src/backend/utils/adt/jsonb_util.c
@@ -187,7 +187,7 @@ compareJsonbContainers(JsonbContainer *a, JsonbContainer *b)
 	{
 		JsonbValue	va,
 					vb;
-		int			ra,
+		JsonbIteratorToken ra,
 					rb;
 
 		ra = JsonbIteratorNext(&ita, &va, false);
@@ -961,10 +961,10 @@ freeAndGetParent(JsonbIterator *it)
 bool
 JsonbDeepContains(JsonbIterator **val, JsonbIterator **mContained)
 {
-	uint32		rval,
-				rcont;
 	JsonbValue	vval,
 				vcontained;
+	JsonbIteratorToken rval,
+				rcont;
 
 	/*
 	 * Guard against stack overflow due to overly complex Jsonb.
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index 1a9a060d4eb..b49a5dd61e4 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -255,7 +255,7 @@ jsonb_object_keys(PG_FUNCTION_ARGS)
 		bool		skipNested = false;
 		JsonbIterator *it;
 		JsonbValue	v;
-		int			r;
+		JsonbIteratorToken r;
 
 		if (JB_ROOT_IS_SCALAR(jb))
 			ereport(ERROR,
@@ -1195,7 +1195,7 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)
 		if (jbvp->type == jbvBinary)
 		{
 			JsonbIterator *it = JsonbIteratorInit((JsonbContainer *) jbvp->val.binary.data);
-			int			r;
+			JsonbIteratorToken r;
 
 			r = JsonbIteratorNext(&it, &tv, true);
 			container = (JsonbContainer *) jbvp->val.binary.data;
@@ -1368,7 +1368,7 @@ each_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname, bool as_text)
 	bool		skipNested = false;
 	JsonbIterator *it;
 	JsonbValue	v;
-	int			r;
+	JsonbIteratorToken r;
 
 	if (!JB_ROOT_IS_OBJECT(jb))
 		ereport(ERROR,
@@ -1687,7 +1687,7 @@ elements_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname,
 	bool		skipNested = false;
 	JsonbIterator *it;
 	JsonbValue	v;
-	int			r;
+	JsonbIteratorToken r;
 
 	if (JB_ROOT_IS_SCALAR(jb))
 		ereport(ERROR,
@@ -2704,7 +2704,7 @@ populate_recordset_worker(FunctionCallInfo fcinfo, const char *funcname,
 		JsonbIterator *it;
 		JsonbValue	v;
 		bool		skipNested = false;
-		int			r;
+		JsonbIteratorToken r;
 
 		Assert(jtype == JSONBOID);