Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd6f0f95

Browse files
Harmonize some more function parameter names.
Make sure that function declarations use names that exactly match thecorresponding names from function definitions in a few places. Theseinconsistencies were all introduced relatively recently, after the codebase had parameter name mismatches fixed in bulk (see commits startingwith commits4274dc2 and035ce1f).pg_bsd_indent still has a couple of similar inconsistencies, which I(pgeoghegan) have left untouched for now.Like all earlier commits that cleaned up function parameter names, thiscommit was written with help from clang-tidy.
1 parentf7431bc commitd6f0f95

File tree

11 files changed

+17
-17
lines changed

11 files changed

+17
-17
lines changed

‎src/backend/parser/parse_expr.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static Node *transformJsonArrayQueryConstructor(ParseState *pstate,
8383
JsonArrayQueryConstructor*ctor);
8484
staticNode*transformJsonObjectAgg(ParseState*pstate,JsonObjectAgg*agg);
8585
staticNode*transformJsonArrayAgg(ParseState*pstate,JsonArrayAgg*agg);
86-
staticNode*transformJsonIsPredicate(ParseState*pstate,JsonIsPredicate*p);
86+
staticNode*transformJsonIsPredicate(ParseState*pstate,JsonIsPredicate*pred);
8787
staticNode*make_row_comparison_op(ParseState*pstate,List*opname,
8888
List*largs,List*rargs,intlocation);
8989
staticNode*make_row_distinct_op(ParseState*pstate,List*opname,

‎src/backend/storage/buffer/bufmgr.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5176,9 +5176,9 @@ TerminateBufferIO(BufferDesc *buf, bool clear_dirty, uint32 set_flag_bits)
51765176
*possible the error condition wasn't related to the I/O.
51775177
*/
51785178
void
5179-
AbortBufferIO(Bufferbuf)
5179+
AbortBufferIO(Bufferbuffer)
51805180
{
5181-
BufferDesc*buf_hdr=GetBufferDescriptor(buf-1);
5181+
BufferDesc*buf_hdr=GetBufferDescriptor(buffer-1);
51825182
uint32buf_state;
51835183

51845184
buf_state=LockBufHdr(buf_hdr);

‎src/backend/utils/activity/pgstat_io.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ pgstat_prepare_io_time(void)
109109
* Like pgstat_count_io_op_n() except it also accumulates time.
110110
*/
111111
void
112-
pgstat_count_io_op_time(IOObjectio_obj,IOContextio_context,IOOpio_op,
112+
pgstat_count_io_op_time(IOObjectio_object,IOContextio_context,IOOpio_op,
113113
instr_timestart_time,uint32cnt)
114114
{
115115
if (track_io_timing)
@@ -122,21 +122,21 @@ pgstat_count_io_op_time(IOObject io_obj, IOContext io_context, IOOp io_op,
122122
if (io_op==IOOP_WRITE)
123123
{
124124
pgstat_count_buffer_write_time(INSTR_TIME_GET_MICROSEC(io_time));
125-
if (io_obj==IOOBJECT_RELATION)
125+
if (io_object==IOOBJECT_RELATION)
126126
INSTR_TIME_ADD(pgBufferUsage.blk_write_time,io_time);
127127
}
128128
elseif (io_op==IOOP_READ)
129129
{
130130
pgstat_count_buffer_read_time(INSTR_TIME_GET_MICROSEC(io_time));
131-
if (io_obj==IOOBJECT_RELATION)
131+
if (io_object==IOOBJECT_RELATION)
132132
INSTR_TIME_ADD(pgBufferUsage.blk_read_time,io_time);
133133
}
134134

135-
INSTR_TIME_ADD(PendingIOStats.pending_times[io_obj][io_context][io_op],
135+
INSTR_TIME_ADD(PendingIOStats.pending_times[io_object][io_context][io_op],
136136
io_time);
137137
}
138138

139-
pgstat_count_io_op_n(io_obj,io_context,io_op,cnt);
139+
pgstat_count_io_op_n(io_object,io_context,io_op,cnt);
140140
}
141141

142142
PgStat_IO*

‎src/backend/utils/adt/pg_locale.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ static size_t uchar_length(UConverter *converter,
149149
constchar*str,int32_tlen);
150150
staticint32_tuchar_convert(UConverter*converter,
151151
UChar*dest,int32_tdestlen,
152-
constchar*str,int32_tsrclen);
152+
constchar*src,int32_tsrclen);
153153
staticvoidicu_set_collation_attributes(UCollator*collator,constchar*loc,
154154
UErrorCode*status);
155155
#endif

‎src/bin/pg_dump/pg_dump.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ static char *getFormattedOperatorName(const char *oproid);
290290
static char *convertTSFunction(Archive *fout, Oid funcOid);
291291
static const char *getFormattedTypeName(Archive *fout, Oid oid, OidOptions opts);
292292
static void getLOs(Archive *fout);
293-
static void dumpLO(Archive *fout, const LoInfo *binfo);
293+
static void dumpLO(Archive *fout, const LoInfo *loinfo);
294294
static intdumpLOs(Archive *fout, const void *arg);
295295
static void dumpPolicy(Archive *fout, const PolicyInfo *polinfo);
296296
static void dumpPublication(Archive *fout, const PublicationInfo *pubinfo);

‎src/include/pgstat.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,13 +515,13 @@ extern PgStat_CheckpointerStats *pgstat_fetch_stat_checkpointer(void);
515515
* Functions in pgstat_io.c
516516
*/
517517

518-
externboolpgstat_bktype_io_stats_valid(PgStat_BktypeIO*context_ops,
518+
externboolpgstat_bktype_io_stats_valid(PgStat_BktypeIO*backend_io,
519519
BackendTypebktype);
520520
externvoidpgstat_count_io_op(IOObjectio_object,IOContextio_context,IOOpio_op);
521521
externvoidpgstat_count_io_op_n(IOObjectio_object,IOContextio_context,IOOpio_op,uint32cnt);
522522
externinstr_timepgstat_prepare_io_time(void);
523523
externvoidpgstat_count_io_op_time(IOObjectio_object,IOContextio_context,
524-
IOOpio_op,instr_timetime,uint32cnt);
524+
IOOpio_op,instr_timestart_time,uint32cnt);
525525

526526
externPgStat_IO*pgstat_fetch_stat_io(void);
527527
externconstchar*pgstat_get_io_context_name(IOContextio_context);

‎src/include/replication/worker_internal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ extern void pa_switch_to_partial_serialize(ParallelApplyWorkerInfo *winfo,
282282
boolstream_locked);
283283

284284
externvoidpa_set_xact_state(ParallelApplyWorkerShared*wshared,
285-
ParallelTransStatein_xact);
285+
ParallelTransStatexact_state);
286286
externvoidpa_set_stream_apply_worker(ParallelApplyWorkerInfo*winfo);
287287

288288
externvoidpa_start_subtrans(TransactionIdcurrent_xid,

‎src/include/storage/buf_internals.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ extern void IssuePendingWritebacks(WritebackContext *context);
392392
externvoidScheduleBufferTagForWriteback(WritebackContext*context,BufferTag*tag);
393393

394394
/* freelist.c */
395-
externIOContextIOContextForStrategy(BufferAccessStrategybas);
395+
externIOContextIOContextForStrategy(BufferAccessStrategystrategy);
396396
externBufferDesc*StrategyGetBuffer(BufferAccessStrategystrategy,
397397
uint32*buf_state,bool*from_ring);
398398
externvoidStrategyFreeBuffer(BufferDesc*buf);

‎src/pl/plpython/plpy_resultobject.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static Py_ssize_t PLy_result_length(PyObject *arg);
2020
staticPyObject*PLy_result_item(PyObject*arg,Py_ssize_tidx);
2121
staticPyObject*PLy_result_str(PyObject*arg);
2222
staticPyObject*PLy_result_subscript(PyObject*arg,PyObject*item);
23-
staticintPLy_result_ass_subscript(PyObject*self,PyObject*item,PyObject*value);
23+
staticintPLy_result_ass_subscript(PyObject*arg,PyObject*item,PyObject*value);
2424

2525
staticcharPLy_result_doc[]="Results of a PostgreSQL query";
2626

‎src/test/modules/test_shm_mq/test_shm_mq.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ typedef struct
3636

3737
/* Set up dynamic shared memory and background workers for test run. */
3838
externvoidtest_shm_mq_setup(int64queue_size,int32nworkers,
39-
dsm_segment**seg,shm_mq_handle**output,
39+
dsm_segment**segp,shm_mq_handle**output,
4040
shm_mq_handle**input);
4141

4242
/* Main entrypoint for a worker. */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp