diff options
| author | Bruce Momjian | 1997-09-12 04:09:08 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1997-09-12 04:09:08 +0000 |
| commit | 1ea01720d53095641205753e766180508ee4d5ad (patch) | |
| tree | c62d9d2be8a531e182d89bb0cef172a80d43c00c /src/backend/rewrite | |
| parent | 6e04b4b20f73b2512fc29353ca706bdb635d7e47 (diff) | |
heapattr functions now return a Datum, not char *.
Diffstat (limited to 'src/backend/rewrite')
| -rw-r--r-- | src/backend/rewrite/rewriteRemove.c | 12 | ||||
| -rw-r--r-- | src/backend/rewrite/rewriteSupport.c | 18 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c index 0955acf6fd..d14fd8b5ae 100644 --- a/src/backend/rewrite/rewriteRemove.c +++ b/src/backend/rewrite/rewriteRemove.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.4 1997/09/08 02:28:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.5 1997/09/12 04:08:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -109,11 +109,11 @@ RemoveRewriteRule(char *ruleName) */ ruleId = tuple->t_oid; eventRelationOidDatum = - PointerGetDatum(heap_getattr(tuple, - buffer, - Anum_pg_rewrite_ev_class, - RelationGetTupleDescriptor(RewriteRelation), - &isNull)); + heap_getattr(tuple, + buffer, + Anum_pg_rewrite_ev_class, + RelationGetTupleDescriptor(RewriteRelation), + &isNull); if (isNull) { /* XXX strange!!! */ diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c index 19423dc998..ab5d00712b 100644 --- a/src/backend/rewrite/rewriteSupport.c +++ b/src/backend/rewrite/rewriteSupport.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.9 1997/09/08 21:46:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.10 1997/09/12 04:08:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,14 +58,14 @@ RuleIdGetActionInfo(Oid ruleoid, bool *instead_flag, Query **parseTrees) if (ruletuple == NULL) elog(WARN, "rule %u isn't in rewrite system relation", ruleoid); - ruleaction = heap_getattr(ruletuple, - InvalidBuffer, - Anum_pg_rewrite_action, - ruleTupdesc, - &action_is_null); - rule_evqual_string = heap_getattr(ruletuple, InvalidBuffer, - Anum_pg_rewrite_ev_qual, - ruleTupdesc, &action_is_null); + ruleaction = (char *)heap_getattr(ruletuple, + InvalidBuffer, + Anum_pg_rewrite_action, + ruleTupdesc, + &action_is_null); + rule_evqual_string = (char *)heap_getattr(ruletuple, InvalidBuffer, + Anum_pg_rewrite_ev_qual, + ruleTupdesc, &action_is_null); *instead_flag = !!heap_getattr(ruletuple, InvalidBuffer, Anum_pg_rewrite_is_instead, ruleTupdesc, &instead_is_null); |