aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/jsonfuncs.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2017-05-19 14:47:56 -0400
committerPeter Eisentraut <peter_e@gmx.net>2017-05-19 14:47:56 -0400
commit7f17ae0ad07a76eeb1b26e7aa8c4539ce14b253b (patch)
tree3f5af9939de8332c93ea6c92906c0a478bb3aa32 /src/backend/utils/adt/jsonfuncs.c
parentf6d5d22ea9497aecdfdfa92717a11f0bcdf17223 (diff)
downloadpostgresql-7f17ae0ad07a76eeb1b26e7aa8c4539ce14b253b.tar.gz
postgresql-7f17ae0ad07a76eeb1b26e7aa8c4539ce14b253b.zip
Fix argument name differences
Different names were used between function declaration and definition.
Diffstat (limited to 'src/backend/utils/adt/jsonfuncs.c')
-rw-r--r--src/backend/utils/adt/jsonfuncs.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index 173584fef60..34de934d87a 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -411,8 +411,8 @@ static Datum populate_record_worker(FunctionCallInfo fcinfo, const char *funcnam
bool have_record_arg);
/* helper functions for populate_record[set] */
-static HeapTupleHeader populate_record(TupleDesc tupdesc, RecordIOData **record_info,
- HeapTupleHeader template, MemoryContext mcxt,
+static HeapTupleHeader populate_record(TupleDesc tupdesc, RecordIOData **record_p,
+ HeapTupleHeader defaultval, MemoryContext mcxt,
JsObject *obj);
static Datum populate_record_field(ColumnIOData *col, Oid typid, int32 typmod,
const char *colname, MemoryContext mcxt,
@@ -3008,12 +3008,12 @@ JsObjectGetField(JsObject *obj, char *field, JsValue *jsv)
/* populate a record tuple from json/jsonb value */
static HeapTupleHeader
populate_record(TupleDesc tupdesc,
- RecordIOData **precord,
+ RecordIOData **record_p,
HeapTupleHeader defaultval,
MemoryContext mcxt,
JsObject *obj)
{
- RecordIOData *record = *precord;
+ RecordIOData *record = *record_p;
Datum *values;
bool *nulls;
HeapTuple res;
@@ -3031,7 +3031,7 @@ populate_record(TupleDesc tupdesc,
/* (re)allocate metadata cache */
if (record == NULL ||
record->ncolumns != ncolumns)
- *precord = record = allocate_record_info(mcxt, ncolumns);
+ *record_p = record = allocate_record_info(mcxt, ncolumns);
/* invalidate metadata cache if the record type has changed */
if (record->record_type != tupdesc->tdtypeid ||