Remove unnecessary casts

Some code carefully cast all data buffer arguments for BufFileWrite()
and BufFileRead() to void *, even though the arguments are already
void * (and AFAICT were never anything else).  Remove this unnecessary
clutter.

Discussion: https://www.postgresql.org/message-id/flat/11dda853-bb5b-59ba-a746-e168b1ce4bdb%40enterprisedb.com

diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index 2718c2113f586f6cf14c7ad68f00c965c888e553..3e1a997f920d33fd6d8d81130306960ab18eaae1 100644 (file)
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -1227,8 +1227,8 @@ ExecHashJoinSaveTuple(MinimalTuple tuple, uint32 hashvalue,
                *fileptr = file;
        }
 
-       BufFileWrite(file, (void *) &hashvalue, sizeof(uint32));
-       BufFileWrite(file, (void *) tuple, tuple->t_len);
+       BufFileWrite(file, &hashvalue, sizeof(uint32));
+       BufFileWrite(file, tuple, tuple->t_len);
 }
 
 /*
@@ -1260,7 +1260,7 @@ ExecHashJoinGetSavedTuple(HashJoinState *hjstate,
         * we can read them both in one BufFileRead() call without any type
         * cheating.
         */
-       nread = BufFileRead(file, (void *) header, sizeof(header));
+       nread = BufFileRead(file, header, sizeof(header));
        if (nread == 0)                         /* end of file */
        {
                ExecClearTuple(tupleSlot);
@@ -1275,7 +1275,7 @@ ExecHashJoinGetSavedTuple(HashJoinState *hjstate,
        tuple = (MinimalTuple) palloc(header[1]);
        tuple->t_len = header[1];
        nread = BufFileRead(file,
-                                               (void *) ((char *) tuple + sizeof(uint32)),
+                                               ((char *) tuple + sizeof(uint32)),
                                                header[1] - sizeof(uint32));
        if (nread != header[1] - sizeof(uint32))
                ereport(ERROR,

diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c
index f605ece721ebd52b6b5a5d3332a11f778793d816..cc884ab11649a5bea6f571da82b55a3c734cdef6 100644 (file)
--- a/src/backend/utils/sort/tuplestore.c
+++ b/src/backend/utils/sort/tuplestore.c
@@ -1468,7 +1468,7 @@ getlen(Tuplestorestate *state, bool eofOK)
        unsigned int len;
        size_t          nbytes;
 
-       nbytes = BufFileRead(state->myfile, (void *) &len, sizeof(len));
+       nbytes = BufFileRead(state->myfile, &len, sizeof(len));
        if (nbytes == sizeof(len))
                return len;
        if (nbytes != 0 || !eofOK)
@@ -1512,10 +1512,10 @@ writetup_heap(Tuplestorestate *state, void *tup)
        /* total on-disk footprint: */
        unsigned int tuplen = tupbodylen + sizeof(int);
 
-       BufFileWrite(state->myfile, (void *) &tuplen, sizeof(tuplen));
-       BufFileWrite(state->myfile, (void *) tupbody, tupbodylen);
+       BufFileWrite(state->myfile, &tuplen, sizeof(tuplen));
+       BufFileWrite(state->myfile, tupbody, tupbodylen);
        if (state->backward)            /* need trailing length word? */
-               BufFileWrite(state->myfile, (void *) &tuplen, sizeof(tuplen));
+               BufFileWrite(state->myfile, &tuplen, sizeof(tuplen));
 
        FREEMEM(state, GetMemoryChunkSpace(tuple));
        heap_free_minimal_tuple(tuple);
@@ -1533,7 +1533,7 @@ readtup_heap(Tuplestorestate *state, unsigned int len)
        USEMEM(state, GetMemoryChunkSpace(tuple));
        /* read in the tuple proper */
        tuple->t_len = tuplen;
-       nread = BufFileRead(state->myfile, (void *) tupbody, tupbodylen);
+       nread = BufFileRead(state->myfile, tupbody, tupbodylen);
        if (nread != (size_t) tupbodylen)
                ereport(ERROR,
                                (errcode_for_file_access(),
@@ -1541,7 +1541,7 @@ readtup_heap(Tuplestorestate *state, unsigned int len)
                                                nread, (size_t) tupbodylen)));
        if (state->backward)            /* need trailing length word? */
        {
-               nread = BufFileRead(state->myfile, (void *) &tuplen, sizeof(tuplen));
+               nread = BufFileRead(state->myfile, &tuplen, sizeof(tuplen));
                if (nread != sizeof(tuplen))
                        ereport(ERROR,
                                        (errcode_for_file_access(),