diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-06-13 07:35:40 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-06-13 07:35:40 +0000 |
| commit | f2d120532207b8873a5e74e7350dd2904f377289 (patch) | |
| tree | 992c89e023c4b29b42bf4fd6563de91f8d6ec8ca /src/backend/utils/adt/ruleutils.c | |
| parent | 8f057d971d663fff9bbb2ae7d053bf71cf09b4a2 (diff) | |
| download | postgresql-f2d120532207b8873a5e74e7350dd2904f377289.tar.gz postgresql-f2d120532207b8873a5e74e7350dd2904f377289.zip | |
Another batch of fmgr updates. I think I have gotten all old-style
functions that take pass-by-value datatypes. Should be ready for
port testing ...
Diffstat (limited to 'src/backend/utils/adt/ruleutils.c')
| -rw-r--r-- | src/backend/utils/adt/ruleutils.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 7bee5abe282..5b2a2ea0163 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -3,7 +3,7 @@ * out of its tuple * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.53 2000/06/12 19:40:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.54 2000/06/13 07:35:08 tgl Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -551,18 +551,19 @@ pg_get_indexdef(PG_FUNCTION_ARGS) * fallback to 'unknown (UID=n)' * ---------- */ -NameData * -pg_get_userbyid(int32 uid) +Datum +pg_get_userbyid(PG_FUNCTION_ARGS) { + int32 uid = PG_GETARG_INT32(0); + Name result; HeapTuple usertup; Form_pg_shadow user_rec; - NameData *result; /* ---------- * Allocate space for the result * ---------- */ - result = (NameData *) palloc(NAMEDATALEN); + result = (Name) palloc(NAMEDATALEN); memset(NameStr(*result), 0, NAMEDATALEN); /* ---------- @@ -570,16 +571,17 @@ pg_get_userbyid(int32 uid) * ---------- */ usertup = SearchSysCacheTuple(SHADOWSYSID, - ObjectIdGetDatum(uid), 0, 0, 0); + ObjectIdGetDatum(uid), + 0, 0, 0); if (HeapTupleIsValid(usertup)) { user_rec = (Form_pg_shadow) GETSTRUCT(usertup); StrNCpy(NameStr(*result), NameStr(user_rec->usename), NAMEDATALEN); } else - sprintf((char *) result, "unknown (UID=%d)", uid); + sprintf(NameStr(*result), "unknown (UID=%d)", uid); - return result; + PG_RETURN_NAME(result); } /* ---------- |