Remove no longer needed casts to Pointer

These casts used to be required when Pointer was char *, but now it's
void * (commit 1b2bb5077e9), so they are not needed anymore.

Reviewed-by: Chao Li <[email protected]>
Reviewed-by: Bertrand Drouvot <[email protected]>
Discussion: https://www.postgresql.org/message-id/4154950a-47ae-4223-bd01-1235cc50e933%40eisentraut.org

diff --git a/contrib/btree_gist/btree_utils_var.h b/contrib/btree_gist/btree_utils_var.h
index 75ad33d24fcd1336e7f6a6f753f168b4f0375f64..6cb3aadf3c33e023ff368124caeae1c3c1cb39fd 100644 (file)
--- a/contrib/btree_gist/btree_utils_var.h
+++ b/contrib/btree_gist/btree_utils_var.h
@@ -49,7 +49,7 @@ typedef struct
  */
 #define GBT_FREE_IF_COPY(ptr1, ptr2) \
        do { \
-               if ((Pointer) (ptr1) != DatumGetPointer(ptr2)) \
+               if ((ptr1) != DatumGetPointer(ptr2)) \
                        pfree(ptr1); \
        } while (0)
 

diff --git a/src/backend/access/heap/heaptoast.c b/src/backend/access/heap/heaptoast.c
index e148c9be482525fcec9c98a62dea5494ce1fd9e5..60e765fbfce1463f2e3a9b623601f3e8ba555b03 100644 (file)
--- a/src/backend/access/heap/heaptoast.c
+++ b/src/backend/access/heap/heaptoast.c
@@ -569,7 +569,7 @@ toast_build_flattened_tuple(TupleDesc tupleDesc,
        int                     num_to_free;
        int                     i;
        Datum           new_values[MaxTupleAttributeNumber];
-       Pointer         freeable_values[MaxTupleAttributeNumber];
+       void       *freeable_values[MaxTupleAttributeNumber];
 
        /*
         * We can pass the caller's isnull array directly to heap_form_tuple, but
@@ -593,7 +593,7 @@ toast_build_flattened_tuple(TupleDesc tupleDesc,
                        {
                                new_value = detoast_external_attr(new_value);
                                new_values[i] = PointerGetDatum(new_value);
-                               freeable_values[num_to_free++] = (Pointer) new_value;
+                               freeable_values[num_to_free++] = new_value;
                        }
                }
        }

diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index d183f2990ce3bfc98e6e8cee1bbcf8af077b8dae..cb496e018c590152e12fd04e60968556ca61d1f3 100644 (file)
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -3125,7 +3125,7 @@ object_aclmask_ext(Oid classid, Oid objectid, Oid roleid,
        result = aclmask(acl, roleid, ownerId, mask, how);
 
        /* if we have a detoasted copy, free it */
-       if (acl && (Pointer) acl != DatumGetPointer(aclDatum))
+       if (acl && acl != DatumGetPointer(aclDatum))
                pfree(acl);
 
        ReleaseSysCache(tuple);
@@ -3255,7 +3255,7 @@ pg_attribute_aclmask_ext(Oid table_oid, AttrNumber attnum, Oid roleid,
        result = aclmask(acl, roleid, ownerId, mask, how);
 
        /* if we have a detoasted copy, free it */
-       if (acl && (Pointer) acl != DatumGetPointer(aclDatum))
+       if (acl && acl != DatumGetPointer(aclDatum))
                pfree(acl);
 
        ReleaseSysCache(attTuple);
@@ -3362,7 +3362,7 @@ pg_class_aclmask_ext(Oid table_oid, Oid roleid, AclMode mask,
        result = aclmask(acl, roleid, ownerId, mask, how);
 
        /* if we have a detoasted copy, free it */
-       if (acl && (Pointer) acl != DatumGetPointer(aclDatum))
+       if (acl && acl != DatumGetPointer(aclDatum))
                pfree(acl);
 
        ReleaseSysCache(tuple);
@@ -3454,7 +3454,7 @@ pg_parameter_aclmask(const char *name, Oid roleid, AclMode mask, AclMaskHow how)
                result = aclmask(acl, roleid, BOOTSTRAP_SUPERUSERID, mask, how);
 
                /* if we have a detoasted copy, free it */
-               if (acl && (Pointer) acl != DatumGetPointer(aclDatum))
+               if (acl && acl != DatumGetPointer(aclDatum))
                        pfree(acl);
 
                ReleaseSysCache(tuple);
@@ -3509,7 +3509,7 @@ pg_parameter_acl_aclmask(Oid acl_oid, Oid roleid, AclMode mask, AclMaskHow how)
        result = aclmask(acl, roleid, BOOTSTRAP_SUPERUSERID, mask, how);
 
        /* if we have a detoasted copy, free it */
-       if (acl && (Pointer) acl != DatumGetPointer(aclDatum))
+       if (acl && acl != DatumGetPointer(aclDatum))
                pfree(acl);
 
        ReleaseSysCache(tuple);
@@ -3589,7 +3589,7 @@ pg_largeobject_aclmask_snapshot(Oid lobj_oid, Oid roleid,
        result = aclmask(acl, roleid, ownerId, mask, how);
 
        /* if we have a detoasted copy, free it */
-       if (acl && (Pointer) acl != DatumGetPointer(aclDatum))
+       if (acl && acl != DatumGetPointer(aclDatum))
                pfree(acl);
 
        systable_endscan(scan);
@@ -3683,7 +3683,7 @@ pg_namespace_aclmask_ext(Oid nsp_oid, Oid roleid,
        result = aclmask(acl, roleid, ownerId, mask, how);
 
        /* if we have a detoasted copy, free it */
-       if (acl && (Pointer) acl != DatumGetPointer(aclDatum))
+       if (acl && acl != DatumGetPointer(aclDatum))
                pfree(acl);
 
        ReleaseSysCache(tuple);
@@ -3819,7 +3819,7 @@ pg_type_aclmask_ext(Oid type_oid, Oid roleid, AclMode mask, AclMaskHow how,
        result = aclmask(acl, roleid, ownerId, mask, how);
 
        /* if we have a detoasted copy, free it */
-       if (acl && (Pointer) acl != DatumGetPointer(aclDatum))
+       if (acl && acl != DatumGetPointer(aclDatum))
                pfree(acl);
 
        ReleaseSysCache(tuple);
@@ -4003,7 +4003,7 @@ pg_attribute_aclcheck_all_ext(Oid table_oid, Oid roleid,
                        attmask = aclmask(acl, roleid, ownerId, mode, ACLMASK_ANY);
 
                        /* if we have a detoasted copy, free it */
-                       if ((Pointer) acl != DatumGetPointer(aclDatum))
+                       if (acl != DatumGetPointer(aclDatum))
                                pfree(acl);
                }
 

diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c
index 9944e4bd2d10e4638f6985095f541b43416cb6ef..5b2a813230627f94d53d82b0ca949d9e44664957 100644 (file)
--- a/src/backend/catalog/pg_constraint.c
+++ b/src/backend/catalog/pg_constraint.c
@@ -1544,7 +1544,7 @@ DeconstructFkConstraintRow(HeapTuple tuple, int *numfks,
        if (numkeys <= 0 || numkeys > INDEX_MAX_KEYS)
                elog(ERROR, "foreign key constraint cannot have %d columns", numkeys);
        memcpy(conkey, ARR_DATA_PTR(arr), numkeys * sizeof(int16));
-       if ((Pointer) arr != DatumGetPointer(adatum))
+       if (arr != DatumGetPointer(adatum))
                pfree(arr);                             /* free de-toasted copy, if any */
 
        adatum = SysCacheGetAttrNotNull(CONSTROID, tuple,
@@ -1556,7 +1556,7 @@ DeconstructFkConstraintRow(HeapTuple tuple, int *numfks,
                ARR_ELEMTYPE(arr) != INT2OID)
                elog(ERROR, "confkey is not a 1-D smallint array");
        memcpy(confkey, ARR_DATA_PTR(arr), numkeys * sizeof(int16));
-       if ((Pointer) arr != DatumGetPointer(adatum))
+       if (arr != DatumGetPointer(adatum))
                pfree(arr);                             /* free de-toasted copy, if any */
 
        if (pf_eq_oprs)
@@ -1571,7 +1571,7 @@ DeconstructFkConstraintRow(HeapTuple tuple, int *numfks,
                        ARR_ELEMTYPE(arr) != OIDOID)
                        elog(ERROR, "conpfeqop is not a 1-D Oid array");
                memcpy(pf_eq_oprs, ARR_DATA_PTR(arr), numkeys * sizeof(Oid));
-               if ((Pointer) arr != DatumGetPointer(adatum))
+               if (arr != DatumGetPointer(adatum))
                        pfree(arr);                     /* free de-toasted copy, if any */
        }
 
@@ -1586,7 +1586,7 @@ DeconstructFkConstraintRow(HeapTuple tuple, int *numfks,
                        ARR_ELEMTYPE(arr) != OIDOID)
                        elog(ERROR, "conppeqop is not a 1-D Oid array");
                memcpy(pp_eq_oprs, ARR_DATA_PTR(arr), numkeys * sizeof(Oid));
-               if ((Pointer) arr != DatumGetPointer(adatum))
+               if (arr != DatumGetPointer(adatum))
                        pfree(arr);                     /* free de-toasted copy, if any */
        }
 
@@ -1601,7 +1601,7 @@ DeconstructFkConstraintRow(HeapTuple tuple, int *numfks,
                        ARR_ELEMTYPE(arr) != OIDOID)
                        elog(ERROR, "conffeqop is not a 1-D Oid array");
                memcpy(ff_eq_oprs, ARR_DATA_PTR(arr), numkeys * sizeof(Oid));
-               if ((Pointer) arr != DatumGetPointer(adatum))
+               if (arr != DatumGetPointer(adatum))
                        pfree(arr);                     /* free de-toasted copy, if any */
        }
 
@@ -1624,7 +1624,7 @@ DeconstructFkConstraintRow(HeapTuple tuple, int *numfks,
                                elog(ERROR, "confdelsetcols is not a 1-D smallint array");
                        num_delete_cols = ARR_DIMS(arr)[0];
                        memcpy(fk_del_set_cols, ARR_DATA_PTR(arr), num_delete_cols * sizeof(int16));
-                       if ((Pointer) arr != DatumGetPointer(adatum))
+                       if (arr != DatumGetPointer(adatum))
                                pfree(arr);             /* free de-toasted copy, if any */
 
                        *num_fk_del_set_cols = num_delete_cols;

diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 5a1b8483beacf9bf49269f0808338a89bad21ae5..cc76bdde723619b9439b6945b23cc531d10ee936 100644 (file)
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -5687,7 +5687,7 @@ accumArrayResultArr(ArrayBuildStateArr *astate,
        MemoryContextSwitchTo(oldcontext);
 
        /* Release detoasted copy if any */
-       if ((Pointer) arg != DatumGetPointer(dvalue))
+       if (arg != DatumGetPointer(dvalue))
                pfree(arg);
 
        return astate;

diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c
index c2b111b829ef29324d63e5e2a8542a0f8dbc2aab..dabcca6f4c5f74aa8b823ae6900b96d9f00b1491 100644 (file)
--- a/src/backend/utils/adt/datum.c
+++ b/src/backend/utils/adt/datum.c
@@ -299,9 +299,9 @@ datum_image_eq(Datum value1, Datum value2, bool typByVal, int typLen)
                                                         len1 - VARHDRSZ) == 0);
 
                        /* Only free memory if it's a copy made here. */
-                       if ((Pointer) arg1val != DatumGetPointer(value1))
+                       if (arg1val != DatumGetPointer(value1))
                                pfree(arg1val);
-                       if ((Pointer) arg2val != DatumGetPointer(value2))
+                       if (arg2val != DatumGetPointer(value2))
                                pfree(arg2val);
                }
        }
@@ -355,7 +355,7 @@ datum_image_hash(Datum value, bool typByVal, int typLen)
                result = hash_bytes((unsigned char *) VARDATA_ANY(val), len - VARHDRSZ);
 
                /* Only free memory if it's a copy made here. */
-               if ((Pointer) val != DatumGetPointer(value))
+               if (val != DatumGetPointer(value))
                        pfree(val);
        }
        else if (typLen == -2)

diff --git a/src/backend/utils/adt/like_support.c b/src/backend/utils/adt/like_support.c
index 999f23f86d51d5e2757d528746ca5d1160dcc35d..dca1d9be035dfdd45b4ae61b30b4387bb3d34840 100644 (file)
--- a/src/backend/utils/adt/like_support.c
+++ b/src/backend/utils/adt/like_support.c
@@ -1035,7 +1035,7 @@ like_fixed_prefix(Const *patt_const, bool case_insensitive, Oid collation,
                pattlen = VARSIZE_ANY_EXHDR(bstr);
                patt = (char *) palloc(pattlen);
                memcpy(patt, VARDATA_ANY(bstr), pattlen);
-               Assert((Pointer) bstr == DatumGetPointer(patt_const->constvalue));
+               Assert(bstr == DatumGetPointer(patt_const->constvalue));
        }
 
        match = palloc(pattlen + 1);
@@ -1577,7 +1577,7 @@ make_greater_string(const Const *str_const, FmgrInfo *ltproc, Oid collation)
                len = VARSIZE_ANY_EXHDR(bstr);
                workstr = (char *) palloc(len);
                memcpy(workstr, VARDATA_ANY(bstr), len);
-               Assert((Pointer) bstr == DatumGetPointer(str_const->constvalue));
+               Assert(bstr == DatumGetPointer(str_const->constvalue));
                cmpstr = str_const->constvalue;
        }
        else

diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index 2501007d981d5e2651ba9c8def8262d4f02942d8..1d626aecbe74b94b4f076dc0f3705d4f8388c50a 100644 (file)
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -2194,7 +2194,7 @@ numeric_abbrev_convert(Datum original_datum, SortSupport ssup)
        }
 
        /* should happen only for external/compressed toasts */
-       if ((Pointer) original_varatt != DatumGetPointer(original_datum))
+       if (original_varatt != DatumGetPointer(original_datum))
                pfree(original_varatt);
 
        return result;
@@ -2284,9 +2284,9 @@ numeric_fast_cmp(Datum x, Datum y, SortSupport ssup)
 
        result = cmp_numerics(nx, ny);
 
-       if ((Pointer) nx != DatumGetPointer(x))
+       if (nx != DatumGetPointer(x))
                pfree(nx);
-       if ((Pointer) ny != DatumGetPointer(y))
+       if (ny != DatumGetPointer(y))
                pfree(ny);
 
        return result;

diff --git a/src/backend/utils/adt/rangetypes.c b/src/backend/utils/adt/rangetypes.c
index b7e9f6dc0a8ebf1a25e3358be5dbec5a758161f5..d8e5130d642c6d8f9fcc8571f91777b2b2bfd482 100644 (file)
--- a/src/backend/utils/adt/rangetypes.c
+++ b/src/backend/utils/adt/rangetypes.c
@@ -1513,9 +1513,9 @@ range_fast_cmp(Datum a, Datum b, SortSupport ssup)
                        cmp = range_cmp_bounds(typcache, &upper1, &upper2);
        }
 
-       if ((Pointer) range_a != DatumGetPointer(a))
+       if (range_a != DatumGetPointer(a))
                pfree(range_a);
-       if ((Pointer) range_b != DatumGetPointer(b))
+       if (range_b != DatumGetPointer(b))
                pfree(range_b);
 
        return cmp;

diff --git a/src/backend/utils/adt/rowtypes.c b/src/backend/utils/adt/rowtypes.c
index 9e5449f17d7c0e39a7b7b5c022f52e8bd248713f..38e6fe1c43a8d9e6980e2cff2f73c913f4409545 100644 (file)
--- a/src/backend/utils/adt/rowtypes.c
+++ b/src/backend/utils/adt/rowtypes.c
@@ -1529,9 +1529,9 @@ record_image_cmp(FunctionCallInfo fcinfo)
                                if ((cmpresult == 0) && (len1 != len2))
                                        cmpresult = (len1 < len2) ? -1 : 1;
 
-                               if ((Pointer) arg1val != DatumGetPointer(values1[i1]))
+                               if (arg1val != DatumGetPointer(values1[i1]))
                                        pfree(arg1val);
-                               if ((Pointer) arg2val != DatumGetPointer(values2[i2]))
+                               if (arg2val != DatumGetPointer(values2[i2]))
                                        pfree(arg2val);
                        }
                        else

diff --git a/src/backend/utils/cache/evtcache.c b/src/backend/utils/cache/evtcache.c
index b9d5a5998be506993b27ca172c92e7a610c5a78c..76ba2db53906fc299ea6e639f7408e4f5686ca49 100644 (file)
--- a/src/backend/utils/cache/evtcache.c
+++ b/src/backend/utils/cache/evtcache.c
@@ -240,7 +240,7 @@ DecodeTextArrayToBitmapset(Datum array)
        }
 
        pfree(elems);
-       if ((Pointer) arr != DatumGetPointer(array))
+       if (arr != DatumGetPointer(array))
                pfree(arr);
 
        return bms;

diff --git a/src/include/fmgr.h b/src/include/fmgr.h
index 74fe3ea05758accba593940adf8ce8e0e328c28a..c0dbe85ed1c31bf1cbfe2b3faa5dd65c39296f0e 100644 (file)
--- a/src/include/fmgr.h
+++ b/src/include/fmgr.h
@@ -259,7 +259,7 @@ extern struct varlena *pg_detoast_datum_packed(struct varlena *datum);
  */
 #define PG_FREE_IF_COPY(ptr,n) \
        do { \
-               if ((Pointer) (ptr) != PG_GETARG_POINTER(n)) \
+               if ((ptr) != PG_GETARG_POINTER(n)) \
                        pfree(ptr); \
        } while (0)