database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Fix argument name differences

Browse Source 
Different names were used between function declaration and definition.
This commit is contained in:
Peter Eisentraut
2017-05-19 14:47:56 -04:00
parent f6d5d22ea9
commit 7f17ae0ad0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/utils/adt/jsonfuncs.c
View File

@@ -411,8 +411,8 @@ static Datum populate_record_worker(FunctionCallInfo fcinfo, const char *funcnam
bool have_record_arg); bool have_record_arg);
/* helper functions for populate_record[set] */ /* helper functions for populate_record[set] */
static HeapTupleHeader populate_record(TupleDesc tupdesc, RecordIOData **record_info, static HeapTupleHeader populate_record(TupleDesc tupdesc, RecordIOData **record_p,
HeapTupleHeader template, MemoryContext mcxt, HeapTupleHeader defaultval, MemoryContext mcxt,
JsObject *obj); JsObject *obj);
static Datum populate_record_field(ColumnIOData *col, Oid typid, int32 typmod, static Datum populate_record_field(ColumnIOData *col, Oid typid, int32 typmod,
const char *colname, MemoryContext mcxt, const char *colname, MemoryContext mcxt,
@@ -3008,12 +3008,12 @@ JsObjectGetField(JsObject *obj, char *field, JsValue *jsv)
/* populate a record tuple from json/jsonb value */ /* populate a record tuple from json/jsonb value */
static HeapTupleHeader static HeapTupleHeader
populate_record(TupleDesc tupdesc, populate_record(TupleDesc tupdesc,
RecordIOData **precord, RecordIOData **record_p,
HeapTupleHeader defaultval, HeapTupleHeader defaultval,
MemoryContext mcxt, MemoryContext mcxt,
JsObject *obj) JsObject *obj)
{ {
RecordIOData *record = *precord; RecordIOData *record = *record_p;
Datum *values; Datum *values;
bool *nulls; bool *nulls;
HeapTuple res; HeapTuple res;
@@ -3031,7 +3031,7 @@ populate_record(TupleDesc tupdesc,
/* (re)allocate metadata cache */ /* (re)allocate metadata cache */
if (record == NULL || if (record == NULL ||
record->ncolumns != ncolumns) 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 */ /* invalidate metadata cache if the record type has changed */
if (record->record_type != tupdesc->tdtypeid || if (record->record_type != tupdesc->tdtypeid ||