From ba1c463096b750b4aa4b692c3fe7c7cc9fbfbd45 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 12 Apr 2008 23:21:04 +0000 Subject: Clean up a few places where Datums were being treated as pointers without going through DatumGetPointer or some other "official" conversion macro. Not actually a bug, since Datum the same size as pointer is the only supported case at the moment, but good cleanup for the future. Gavin Sherry --- src/backend/utils/mb/mbutils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/backend/utils/mb/mbutils.c') diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index 4d8043dfc83..cd1ee00c10a 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -4,7 +4,7 @@ * (currently mule internal code (mic) is used) * Tatsuo Ishii * - * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.69 2008/01/09 23:43:54 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.70 2008/04/12 23:21:04 tgl Exp $ */ #include "postgres.h" @@ -313,7 +313,7 @@ pg_convert_to(PG_FUNCTION_ARGS) result = DirectFunctionCall3(pg_convert, string, src_encoding_name, dest_encoding_name); - PG_RETURN_BYTEA_P(result); + PG_RETURN_DATUM(result); } /* @@ -340,7 +340,7 @@ pg_convert_from(PG_FUNCTION_ARGS) * in this case it will be because we've told pg_convert to return one * that is valid as text in the current database encoding. */ - PG_RETURN_TEXT_P(result); + PG_RETURN_DATUM(result); } /* -- cgit v1.2.3