From 3e0fff2e6888e39b0ad5cdfdb78bc1c2bb2b22c9 Mon Sep 17 00:00:00 2001 From: David Rowley Date: Fri, 26 Aug 2022 02:35:40 +1200 Subject: More -Wshadow=compatible-local warning fixes In a similar effort to f01592f91, here we're targetting fixing the warnings where we've deemed the shadowing variable to serve a close enough purpose to the shadowed variable just to reuse the shadowed version and not declare the shadowing variable at all. By my count, this takes the warning count from 106 down to 71. Author: Justin Pryzby Discussion: https://postgr.es/m/20220825020839.GT2342@telsasoft.com --- src/backend/access/transam/xlog.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/backend/access/transam/xlog.c') diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 87b243e0d4b..537845cada7 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -3036,8 +3036,7 @@ XLogFileInitInternal(XLogSegNo logsegno, TimeLineID logtli, pgstat_report_wait_start(WAIT_EVENT_WAL_INIT_SYNC); if (pg_fsync(fd) != 0) { - int save_errno = errno; - + save_errno = errno; close(fd); errno = save_errno; ereport(ERROR, @@ -4721,7 +4720,6 @@ XLogInitNewTimeline(TimeLineID endTLI, XLogRecPtr endOfLog, TimeLineID newTLI) if (close(fd) != 0) { - char xlogfname[MAXFNAMELEN]; int save_errno = errno; XLogFileName(xlogfname, newTLI, startLogSegNo, wal_segment_size); -- cgit v1.2.3