aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/jsonb_op.c
diff options
context:
space:
mode:
authorNoah Misch <noah@leadboat.com>2015-10-11 23:53:35 -0400
committerNoah Misch <noah@leadboat.com>2015-10-11 23:53:35 -0400
commit7732d49ca211571552bf82b5207deed95c0cc09c (patch)
tree6076ea33201132e5b850f5a4ae4cc51f7430bc8e /src/backend/utils/adt/jsonb_op.c
parentf20b26960ae62a3ffd12782eea09e0e9c23a2ac1 (diff)
downloadpostgresql-7732d49ca211571552bf82b5207deed95c0cc09c.tar.gz
postgresql-7732d49ca211571552bf82b5207deed95c0cc09c.zip
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.
Diffstat (limited to 'src/backend/utils/adt/jsonb_op.c')
-rw-r--r--src/backend/utils/adt/jsonb_op.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/utils/adt/jsonb_op.c b/src/backend/utils/adt/jsonb_op.c
index 0635d0818f4..74cf4fc7153 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);
}
}