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

diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 2fdcd70392041be00203158ebbfba5317e9ade4c..657f0f89b8681d83673ea376328a4f9ee5ecdab2 100644 (file)
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -754,7 +754,8 @@ text_substring(Datum str, int32 start, int32 length, bool length_not_specified)
                 * If we're working with an untoasted source, no need to do an extra
                 * copying step.
                 */
-               if (VARATT_IS_COMPRESSED(str) || VARATT_IS_EXTERNAL(str))
+               if (VARATT_IS_COMPRESSED(DatumGetPointer(str)) || 
+                       VARATT_IS_EXTERNAL(DatumGetPointer(str)))
                        slice = DatumGetTextPSlice(str, slice_start, slice_size);
                else
                        slice = (text *) DatumGetPointer(str);

diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index a674ae58ea047e8704815684142de8b2737eeeef..301b3b997ed0f7b3768aee4d8c9b4013169fc142 100644 (file)
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -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);
 }
 
 /*