From 5ba877945f712a6bcdec29b905effef0867ba46b Mon Sep 17 00:00:00 2001 From: Marina Polyakova Date: Mon, 21 Nov 2022 16:20:39 +0300 Subject: [PATCH] Fix compiler warnings due to new checks in PostgreSQL 16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See the commit 0fe954c28584169938e5c0738cfaa9930ce77577 (Add -Wshadow=compatible-local to the standard compilation flags) in PostgreSQL 16. pg_query_state.c: In function ‘pg_query_state’: pg_query_state.c:615:66: warning: declaration of ‘msg’ shadows a previous local [-Wshadow=compatible-local] 615 | shm_mq_msg *msg = (shm_mq_msg *) lfirst(i); | ^~~ pg_query_state.c:489:42: note: shadowed declaration is here 489 | shm_mq_msg *msg; | ^~~ pg_query_state.c: In function ‘GetRemoteBackendWorkers’: pg_query_state.c:946:25: warning: declaration of ‘proc’ shadows a parameter [-Wshadow=compatible-local] 946 | PGPROC *proc = BackendPidGetProc(pid); | ^~~~ pg_query_state.c:913:33: note: shadowed declaration is here 913 | GetRemoteBackendWorkers(PGPROC *proc) | ~~~~~~~~^~~~ --- pg_query_state.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pg_query_state.c b/pg_query_state.c index 2c8a917..3419d64 100644 --- a/pg_query_state.c +++ b/pg_query_state.c @@ -612,17 +612,18 @@ pg_query_state(PG_FUNCTION_ARGS) foreach(i, msgs) { List *qs_stack; - shm_mq_msg *msg = (shm_mq_msg *) lfirst(i); + shm_mq_msg *current_msg = (shm_mq_msg *) lfirst(i); proc_state *p_state = (proc_state *) palloc(sizeof(proc_state)); - if (msg->result_code != QS_RETURNED) + if (current_msg->result_code != QS_RETURNED) continue; - AssertState(msg->result_code == QS_RETURNED); + AssertState(current_msg->result_code == QS_RETURNED); - qs_stack = deserialize_stack(msg->stack, msg->stack_depth); + qs_stack = deserialize_stack(current_msg->stack, + current_msg->stack_depth); - p_state->proc = msg->proc; + p_state->proc = current_msg->proc; p_state->stack = qs_stack; p_state->frame_index = 0; p_state->frame_cursor = list_head(qs_stack); @@ -943,10 +944,10 @@ GetRemoteBackendWorkers(PGPROC *proc) for (i = 0; i < msg->number; i++) { pid_t pid = msg->pids[i]; - PGPROC *proc = BackendPidGetProc(pid); - if (!proc || !proc->pid) + PGPROC *current_proc = BackendPidGetProc(pid); + if (!current_proc || !current_proc->pid) continue; - result = lcons(proc, result); + result = lcons(current_proc, result); } #if PG_VERSION_NUM < 100000