summaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
authorPeter Geoghegan2023-04-13 17:15:20 +0000
committerPeter Geoghegan2023-04-13 17:15:20 +0000
commitd6f0f95a6bb7fa43731c6db83226a3c574041659 (patch)
tree0d7f1e9c600b8bc5162dd3a03ed16454e7638199 /src/backend/utils
parentf7431bca8b0138bdbce7025871560d39119565a0 (diff)
Harmonize some more function parameter names.
Make sure that function declarations use names that exactly match the corresponding names from function definitions in a few places. These inconsistencies were all introduced relatively recently, after the code base had parameter name mismatches fixed in bulk (see commits starting with commits 4274dc22 and 035ce1fe). 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, this commit was written with help from clang-tidy.
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/activity/pgstat_io.c10
-rw-r--r--src/backend/utils/adt/pg_locale.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index a135569865..25735eb6c0 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -109,7 +109,7 @@ pgstat_prepare_io_time(void)
* Like pgstat_count_io_op_n() except it also accumulates time.
*/
void
-pgstat_count_io_op_time(IOObject io_obj, IOContext io_context, IOOp io_op,
+pgstat_count_io_op_time(IOObject io_object, IOContext io_context, IOOp io_op,
instr_time start_time, uint32 cnt)
{
if (track_io_timing)
@@ -122,21 +122,21 @@ pgstat_count_io_op_time(IOObject io_obj, IOContext io_context, IOOp io_op,
if (io_op == IOOP_WRITE)
{
pgstat_count_buffer_write_time(INSTR_TIME_GET_MICROSEC(io_time));
- if (io_obj == IOOBJECT_RELATION)
+ if (io_object == IOOBJECT_RELATION)
INSTR_TIME_ADD(pgBufferUsage.blk_write_time, io_time);
}
else if (io_op == IOOP_READ)
{
pgstat_count_buffer_read_time(INSTR_TIME_GET_MICROSEC(io_time));
- if (io_obj == IOOBJECT_RELATION)
+ if (io_object == IOOBJECT_RELATION)
INSTR_TIME_ADD(pgBufferUsage.blk_read_time, io_time);
}
- INSTR_TIME_ADD(PendingIOStats.pending_times[io_obj][io_context][io_op],
+ INSTR_TIME_ADD(PendingIOStats.pending_times[io_object][io_context][io_op],
io_time);
}
- pgstat_count_io_op_n(io_obj, io_context, io_op, cnt);
+ pgstat_count_io_op_n(io_object, io_context, io_op, cnt);
}
PgStat_IO *
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index 1848d42f76..092b620673 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -149,7 +149,7 @@ static size_t uchar_length(UConverter *converter,
const char *str, int32_t len);
static int32_t uchar_convert(UConverter *converter,
UChar *dest, int32_t destlen,
- const char *str, int32_t srclen);
+ const char *src, int32_t srclen);
static void icu_set_collation_attributes(UCollator *collator, const char *loc,
UErrorCode *status);
#endif