diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-26 19:30:17 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-26 19:30:17 +0000 |
| commit | 0858ed20d2a3da65de63926c272f80d988a6c58d (patch) | |
| tree | 8e12de56a39160839313157b40cebecd4257d3d5 | |
| parent | 437063bdc42f0232519cf1a14c1b84c6d85873bb (diff) | |
| download | postgresql-0858ed20d2a3da65de63926c272f80d988a6c58d.tar.gz postgresql-0858ed20d2a3da65de63926c272f80d988a6c58d.zip | |
A couple other cosmetic cleanups in new List stuff.
| -rw-r--r-- | src/backend/utils/adt/ruleutils.c | 11 | ||||
| -rw-r--r-- | src/include/nodes/pg_list.h | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 213dc61202b..0356b183fca 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -3,7 +3,7 @@ * back to source text * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.167 2004/05/26 04:41:38 neilc Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.168 2004/05/26 19:30:12 tgl Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -2274,17 +2274,14 @@ static void get_names_for_var(Var *var, deparse_context *context, char **schemaname, char **refname, char **attname) { - ListCell *nslist_item = list_head(context->namespaces); - int sup = var->varlevelsup; deparse_namespace *dpns; RangeTblEntry *rte; /* Find appropriate nesting depth */ - while (sup-- > 0 && nslist_item != NULL) - nslist_item = lnext(nslist_item); - if (nslist_item == NULL) + if (var->varlevelsup >= list_length(context->namespaces)) elog(ERROR, "bogus varlevelsup: %d", var->varlevelsup); - dpns = (deparse_namespace *) lfirst(nslist_item); + dpns = (deparse_namespace *) list_nth(context->namespaces, + var->varlevelsup); /* Find the relevant RTE */ if (var->varno >= 1 && var->varno <= length(dpns->rtable)) diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index 31c90de88c9..08a11ef552e 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/pg_list.h,v 1.44 2004/05/26 04:41:45 neilc Exp $ + * $PostgreSQL: pgsql/src/include/nodes/pg_list.h,v 1.45 2004/05/26 19:30:17 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -49,8 +49,6 @@ * always be so; try to be careful to maintain the distinction.) */ -#define LIST_CELL_TYPE ListCell - typedef struct ListCell ListCell; typedef struct List List; |