rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Peter Eisentraut 2022-12-08 08:51:38 +01:00
parent 2d4f1ba6cf
commit 07c29ca7fe
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/executor/nodeHashjoin.c
View File

@ -1227,8 +1227,8 @@ ExecHashJoinSaveTuple(MinimalTuple tuple, uint32 hashvalue,
*fileptr = file; *fileptr = file;
} }
BufFileWrite(file, (void *) &hashvalue, sizeof(uint32)); BufFileWrite(file, &hashvalue, sizeof(uint32));
BufFileWrite(file, (void *) tuple, tuple->t_len); 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 * we can read them both in one BufFileRead() call without any type
* cheating. * cheating.
*/ */
nread = BufFileRead(file, (void *) header, sizeof(header)); nread = BufFileRead(file, header, sizeof(header));
if (nread == 0) /* end of file */ if (nread == 0) /* end of file */
{ {
ExecClearTuple(tupleSlot); ExecClearTuple(tupleSlot);
@ -1275,7 +1275,7 @@ ExecHashJoinGetSavedTuple(HashJoinState *hjstate,
tuple = (MinimalTuple) palloc(header[1]); tuple = (MinimalTuple) palloc(header[1]);
tuple->t_len = header[1]; tuple->t_len = header[1];
nread = BufFileRead(file, nread = BufFileRead(file,
(void *) ((char *) tuple + sizeof(uint32)), ((char *) tuple + sizeof(uint32)),
header[1] - sizeof(uint32)); header[1] - sizeof(uint32));
if (nread != header[1] - sizeof(uint32)) if (nread != header[1] - sizeof(uint32))
ereport(ERROR, ereport(ERROR,

12
src/backend/utils/sort/tuplestore.c
View File

@ -1468,7 +1468,7 @@ getlen(Tuplestorestate *state, bool eofOK)
unsigned int len; unsigned int len;
size_t nbytes; size_t nbytes;
nbytes = BufFileRead(state->myfile, (void *) &len, sizeof(len)); nbytes = BufFileRead(state->myfile, &len, sizeof(len));
if (nbytes == sizeof(len)) if (nbytes == sizeof(len))
return len; return len;
if (nbytes != 0 || !eofOK) if (nbytes != 0 || !eofOK)
@ -1512,10 +1512,10 @@ writetup_heap(Tuplestorestate *state, void *tup)
/* total on-disk footprint: */ /* total on-disk footprint: */
unsigned int tuplen = tupbodylen + sizeof(int); unsigned int tuplen = tupbodylen + sizeof(int);
BufFileWrite(state->myfile, (void *) &tuplen, sizeof(tuplen)); BufFileWrite(state->myfile, &tuplen, sizeof(tuplen));
BufFileWrite(state->myfile, (void *) tupbody, tupbodylen); BufFileWrite(state->myfile, tupbody, tupbodylen);
if (state->backward) /* need trailing length word? */ if (state->backward) /* need trailing length word? */
BufFileWrite(state->myfile, (void *) &tuplen, sizeof(tuplen)); BufFileWrite(state->myfile, &tuplen, sizeof(tuplen));
FREEMEM(state, GetMemoryChunkSpace(tuple)); FREEMEM(state, GetMemoryChunkSpace(tuple));
heap_free_minimal_tuple(tuple); heap_free_minimal_tuple(tuple);
@ -1533,7 +1533,7 @@ readtup_heap(Tuplestorestate *state, unsigned int len)
USEMEM(state, GetMemoryChunkSpace(tuple)); USEMEM(state, GetMemoryChunkSpace(tuple));
/* read in the tuple proper */ /* read in the tuple proper */
tuple->t_len = tuplen; tuple->t_len = tuplen;
nread = BufFileRead(state->myfile, (void *) tupbody, tupbodylen); nread = BufFileRead(state->myfile, tupbody, tupbodylen);
if (nread != (size_t) tupbodylen) if (nread != (size_t) tupbodylen)
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
@ -1541,7 +1541,7 @@ readtup_heap(Tuplestorestate *state, unsigned int len)
nread, (size_t) tupbodylen))); nread, (size_t) tupbodylen)));
if (state->backward) /* need trailing length word? */ 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)) if (nread != sizeof(tuplen))
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),