From 34b96535c268fac21034d2076c54f10da7e9a3b3 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 17 Oct 2020 08:38:39 +0200 Subject: [PATCH 3/3] Silence some pg_nodiscard warnings Two cases violated pg_nodiscard declarations on the list API. While the code was technically correct, it relied on internal knowledge of the list implementation, and the code wasn't really gaining anything that way, so just fix it by assigning the return value properly. --- src/backend/commands/lockcmds.c | 2 +- src/backend/parser/analyze.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c index d8cafc42bb..08c4de1d81 100644 --- a/src/backend/commands/lockcmds.c +++ b/src/backend/commands/lockcmds.c @@ -263,7 +263,7 @@ LockViewRecurse(Oid reloid, LOCKMODE lockmode, bool nowait, List *ancestor_views LockViewRecurse_walker((Node *) viewquery, &context); - (void) list_delete_last(context.ancestor_views); + context.ancestor_views = list_delete_last(context.ancestor_views); table_close(view, NoLock); } diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index c159fb2957..4aab2eddcb 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -1486,8 +1486,7 @@ transformValuesClause(ParseState *pstate, SelectStmt *stmt) Node *col = (Node *) lfirst(lc); List *sublist = lfirst(lc2); - /* sublist pointer in exprsLists won't need adjustment */ - (void) lappend(sublist, col); + sublist = lappend(sublist, col); } list_free(colexprs[i]); } -- 2.28.0