Fix final compiler warning produced by -Wshadow=compatible-local

david-rowley · david-rowley · commit d8df67bb1ad9 · 2022-10-06T10:19:36.000+13:00
We're now able to compile the entire tree with -Wshadow=compatible-local without any compiler warnings. Author: David Rowley Discussion: https://postgr.es/m/CAApHDvqWGMdB_pATeUqE=JCtNqNxObPOJ00jFEa2_sZ20j_Wvg@mail.gmail.com
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
@@ -7506,17 +7506,17 @@ threadRun(void *arg)
 		/* progress report is made by thread 0 for all threads */
 		if (progress && thread->tid == 0)
 		{
-			pg_time_usec_t now = pg_time_now();
+			pg_time_usec_t now2 = pg_time_now();
 
-			if (now >= next_report)
+			if (now2 >= next_report)
 			{
 				/*
 				 * Horrible hack: this relies on the thread pointer we are
 				 * passed to be equivalent to threads[0], that is the first
 				 * entry of the threads array.  That is why this MUST be done
 				 * by thread 0 and not any other.
 				 */
-				printProgressReport(thread, thread_start, now,
+				printProgressReport(thread, thread_start, now2,
 									&last, &last_report);
 
 				/*
@@ -7526,7 +7526,7 @@ threadRun(void *arg)
 				do
 				{
 					next_report += (int64) 1000000 * progress;
-				} while (now >= next_report);
+				} while (now2 >= next_report);
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -7506,17 +7506,17 @@ threadRun(void *arg)`
`7506`	`7506`	`/* progress report is made by thread 0 for all threads */`
`7507`	`7507`	`if (progress && thread->tid == 0)`
`7508`	`7508`	`{`
`7509`		`- pg_time_usec_t now = pg_time_now();`
	`7509`	`+ pg_time_usec_t now2 = pg_time_now();`
`7510`	`7510`
`7511`		`- if (now >= next_report)`
	`7511`	`+ if (now2 >= next_report)`
`7512`	`7512`	`{`
`7513`	`7513`	`/*`
`7514`	`7514`	`* Horrible hack: this relies on the thread pointer we are`
`7515`	`7515`	`* passed to be equivalent to threads[0], that is the first`
`7516`	`7516`	`* entry of the threads array. That is why this MUST be done`
`7517`	`7517`	`* by thread 0 and not any other.`
`7518`	`7518`	`*/`
`7519`		`- printProgressReport(thread, thread_start, now,`
	`7519`	`+ printProgressReport(thread, thread_start, now2,`
`7520`	`7520`	`&last, &last_report);`
`7521`	`7521`
`7522`	`7522`	`/*`
`@@ -7526,7 +7526,7 @@ threadRun(void *arg)`
`7526`	`7526`	`do`
`7527`	`7527`	`{`
`7528`	`7528`	`next_report += (int64) 1000000 * progress;`
`7529`		`- } while (now >= next_report);`
	`7529`	`+ } while (now2 >= next_report);`
`7530`	`7530`	`}`
`7531`	`7531`	`}`
`7532`	`7532`	`}`