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/dropcmds.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/backend/commands/dropcmds.c') diff --git a/src/backend/commands/dropcmds.c b/src/backend/commands/dropcmds.c index cb948f0204d..c18bc319bed 100644 --- a/src/backend/commands/dropcmds.c +++ b/src/backend/commands/dropcmds.c @@ -214,7 +214,7 @@ type_in_list_does_not_exist_skipping(List *typenames, const char **msg, foreach(l, typenames) { - TypeName *typeName = castNode(TypeName, lfirst(l)); + TypeName *typeName = lfirst_node(TypeName, l); if (typeName != NULL) { @@ -371,8 +371,8 @@ does_not_exist_skipping(ObjectType objtype, Node *object) { /* XXX quote or no quote? */ msg = gettext_noop("cast from type %s to type %s does not exist, skipping"); - name = TypeNameToString(castNode(TypeName, linitial(castNode(List, object)))); - args = TypeNameToString(castNode(TypeName, lsecond(castNode(List, object)))); + name = TypeNameToString(linitial_node(TypeName, castNode(List, object))); + args = TypeNameToString(lsecond_node(TypeName, castNode(List, object))); } } break; @@ -380,7 +380,7 @@ does_not_exist_skipping(ObjectType objtype, Node *object) if (!type_in_list_does_not_exist_skipping(list_make1(linitial(castNode(List, object))), &msg, &name)) { msg = gettext_noop("transform for type %s language \"%s\" does not exist, skipping"); - name = TypeNameToString(castNode(TypeName, linitial(castNode(List, object)))); + name = TypeNameToString(linitial_node(TypeName, castNode(List, object))); args = strVal(lsecond(castNode(List, object))); } break; -- cgit v1.2.3