From 7732d49ca211571552bf82b5207deed95c0cc09c Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Sun, 11 Oct 2015 23:53:35 -0400 Subject: 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_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/backend/utils/adt/jsonb_util.c') diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c index 4d733159d06..c402eab22e6 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. -- cgit v1.2.3