diff options
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/trigger.c | 16 | ||||
| -rw-r--r-- | src/backend/commands/user.c | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 82feb9333d7..16da206adec 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.128 2002/08/22 00:01:42 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.129 2002/08/25 17:20:00 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -261,7 +261,7 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint) foreach(le, stmt->args) { - char *ar = ((Value *) lfirst(le))->val.str; + char *ar = strVal(lfirst(le)); len += strlen(ar) + 4; for (; *ar; ar++) @@ -274,7 +274,7 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint) args[0] = '\0'; foreach(le, stmt->args) { - char *s = ((Value *) lfirst(le))->val.str; + char *s = strVal(lfirst(le)); char *d = args + strlen(args); while (*s) @@ -653,8 +653,6 @@ RelationBuildTriggers(Relation relation) ScanKeyData skey; SysScanDesc tgscan; HeapTuple htup; - struct varlena *val; - bool isnull; triggers = (Trigger *) MemoryContextAlloc(CacheMemoryContext, ntrigs * sizeof(Trigger)); @@ -702,12 +700,14 @@ RelationBuildTriggers(Relation relation) FUNC_MAX_ARGS * sizeof(int16)); if (build->tgnargs > 0) { + bytea *val; + bool isnull; char *p; int i; - val = (struct varlena *) fastgetattr(htup, - Anum_pg_trigger_tgargs, - tgrel->rd_att, &isnull); + val = (bytea *) fastgetattr(htup, + Anum_pg_trigger_tgargs, + tgrel->rd_att, &isnull); if (isnull) elog(ERROR, "RelationBuildTriggers: tgargs IS NULL for rel %s", RelationGetRelationName(relation)); diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 60fc4b733cb..3e8d521ab76 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.107 2002/08/05 03:29:17 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.108 2002/08/25 17:20:01 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -50,7 +50,7 @@ static List *IdArrayToList(IdList *oldarray); * fputs_quote * * Outputs string in quotes, with double-quotes duplicated. - * We could use quote_ident(), but that expects varlena. + * We could use quote_ident(), but that expects a TEXT argument. */ static void fputs_quote(char *str, FILE *fp) { |