From 8f0530f58061b185dc385df42e62d78a18d4ae3e Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 10 Apr 2017 13:51:29 -0400 Subject: Improve castNode notation by introducing list-extraction-specific variants. This extends the castNode() notation introduced by commit 5bcab1114 to provide, in one step, extraction of a list cell's pointer and coercion to a concrete node type. For example, "lfirst_node(Foo, lc)" is the same as "castNode(Foo, lfirst(lc))". Almost half of the uses of castNode that have appeared so far include a list extraction call, so this is pretty widely useful, and it saves a few more keystrokes compared to the old way. As with the previous patch, back-patch the addition of these macros to pg_list.h, so that the notation will be available when back-patching. Patch by me, after an idea of Andrew Gierth's. Discussion: https://postgr.es/m/14197.1491841216@sss.pgh.pa.us --- src/backend/commands/async.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/backend/commands/async.c') diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index e32d7a1d4ec..87b215d8d32 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -1636,7 +1636,7 @@ AtSubCommit_Notify(void) List *parentPendingActions; List *parentPendingNotifies; - parentPendingActions = castNode(List, linitial(upperPendingActions)); + parentPendingActions = linitial_node(List, upperPendingActions); upperPendingActions = list_delete_first(upperPendingActions); Assert(list_length(upperPendingActions) == @@ -1647,7 +1647,7 @@ AtSubCommit_Notify(void) */ pendingActions = list_concat(parentPendingActions, pendingActions); - parentPendingNotifies = castNode(List, linitial(upperPendingNotifies)); + parentPendingNotifies = linitial_node(List, upperPendingNotifies); upperPendingNotifies = list_delete_first(upperPendingNotifies); Assert(list_length(upperPendingNotifies) == @@ -1679,13 +1679,13 @@ AtSubAbort_Notify(void) */ while (list_length(upperPendingActions) > my_level - 2) { - pendingActions = castNode(List, linitial(upperPendingActions)); + pendingActions = linitial_node(List, upperPendingActions); upperPendingActions = list_delete_first(upperPendingActions); } while (list_length(upperPendingNotifies) > my_level - 2) { - pendingNotifies = castNode(List, linitial(upperPendingNotifies)); + pendingNotifies = linitial_node(List, upperPendingNotifies); upperPendingNotifies = list_delete_first(upperPendingNotifies); } } -- cgit v1.2.3