From 5104fe8d3c2569d74ef77626684d9a38372d36f8 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 2 Feb 2023 23:02:34 +0100 Subject: [PATCH 3/8] Remove useless casts to (void *) (memcpy) --- contrib/btree_gist/btree_bit.c | 2 +- contrib/btree_gist/btree_interval.c | 4 ++-- contrib/btree_gist/btree_utils_num.c | 6 +++--- contrib/btree_gist/btree_uuid.c | 4 ++-- contrib/ltree/ltxtquery_io.c | 4 ++-- contrib/pg_trgm/trgm_gist.c | 2 +- doc/src/sgml/xfunc.sgml | 4 ++-- src/backend/access/gist/gistproc.c | 4 ++-- src/backend/storage/ipc/procarray.c | 4 ++-- src/backend/utils/adt/tsgistidx.c | 2 +- src/backend/utils/adt/tsquery.c | 4 ++-- src/backend/utils/adt/tsquery_cleanup.c | 2 +- src/backend/utils/adt/tsvector.c | 2 +- src/tutorial/funcs.c | 4 ++-- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/contrib/btree_gist/btree_bit.c b/contrib/btree_gist/btree_bit.c index 5b246bcde4..6790f22b4b 100644 --- a/contrib/btree_gist/btree_bit.c +++ b/contrib/btree_gist/btree_bit.c @@ -84,7 +84,7 @@ gbt_bit_xfrm(bytea *leaf) while (sz < padded_sz) ((char *) out)[sz++] = 0; SET_VARSIZE(out, padded_sz); - memcpy((void *) VARDATA(out), (void *) VARBITS(leaf), VARBITBYTES(leaf)); + memcpy(VARDATA(out), VARBITS(leaf), VARBITBYTES(leaf)); return out; } diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c index 2c98b330cd..b0afdf02bb 100644 --- a/contrib/btree_gist/btree_interval.c +++ b/contrib/btree_gist/btree_interval.c @@ -157,8 +157,8 @@ gbt_intv_compress(PG_FUNCTION_ARGS) { Interval *key = DatumGetIntervalP(entry->key); - memcpy((void *) r, (void *) key, INTERVALSIZE); - memcpy((void *) (r + INTERVALSIZE), (void *) key, INTERVALSIZE); + memcpy(r, key, INTERVALSIZE); + memcpy(r + INTERVALSIZE, key, INTERVALSIZE); } else { diff --git a/contrib/btree_gist/btree_utils_num.c b/contrib/btree_gist/btree_utils_num.c index 05c154afa3..cfbecbea65 100644 --- a/contrib/btree_gist/btree_utils_num.c +++ b/contrib/btree_gist/btree_utils_num.c @@ -87,8 +87,8 @@ gbt_num_compress(GISTENTRY *entry, const gbtree_ninfo *tinfo) Assert(tinfo->indexsize >= 2 * tinfo->size); - memcpy((void *) &r[0], leaf, tinfo->size); - memcpy((void *) &r[tinfo->size], leaf, tinfo->size); + memcpy(&r[0], leaf, tinfo->size); + memcpy(&r[tinfo->size], leaf, tinfo->size); retval = palloc(sizeof(GISTENTRY)); gistentryinit(*retval, PointerGetDatum(r), entry->rel, entry->page, entry->offset, false); @@ -184,7 +184,7 @@ gbt_num_union(GBT_NUMKEY *out, const GistEntryVector *entryvec, const gbtree_nin o.lower = &((GBT_NUMKEY *) out)[0]; o.upper = &((GBT_NUMKEY *) out)[tinfo->size]; - memcpy((void *) out, (void *) cur, 2 * tinfo->size); + memcpy(out, cur, 2 * tinfo->size); for (i = 1; i < numranges; i++) { diff --git a/contrib/btree_gist/btree_uuid.c b/contrib/btree_gist/btree_uuid.c index b81875979a..fe8c679cbe 100644 --- a/contrib/btree_gist/btree_uuid.c +++ b/contrib/btree_gist/btree_uuid.c @@ -110,8 +110,8 @@ gbt_uuid_compress(PG_FUNCTION_ARGS) retval = palloc(sizeof(GISTENTRY)); - memcpy((void *) r, (void *) key, UUID_LEN); - memcpy((void *) (r + UUID_LEN), (void *) key, UUID_LEN); + memcpy(r, key, UUID_LEN); + memcpy(r + UUID_LEN, key, UUID_LEN); gistentryinit(*retval, PointerGetDatum(r), entry->rel, entry->page, entry->offset, false); diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c index 82d617f1ae..0d29e15630 100644 --- a/contrib/ltree/ltxtquery_io.c +++ b/contrib/ltree/ltxtquery_io.c @@ -198,7 +198,7 @@ pushval_asis(QPRS_STATE *state, int type, char *strval, int lenval, uint16 flag) state->op = (char *) repalloc(state->op, state->lenop); state->curop = state->op + tmp; } - memcpy((void *) state->curop, (void *) strval, lenval); + memcpy(state->curop, strval, lenval); state->curop += lenval; *(state->curop) = '\0'; state->curop++; @@ -391,7 +391,7 @@ queryin(char *buf, struct Node *escontext) } /* set user-friendly operand view */ - memcpy((void *) GETOPERAND(query), (void *) state.op, state.sumlen); + memcpy(GETOPERAND(query), state.op, state.sumlen); pfree(state.op); /* set left operand's position for every operator */ diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c index ef5d8cca78..68ebf1767b 100644 --- a/contrib/pg_trgm/trgm_gist.c +++ b/contrib/pg_trgm/trgm_gist.c @@ -755,7 +755,7 @@ fillcache(CACHESIGN *item, TRGM *key, BITVECP sign, int siglen) else if (ISALLTRUE(key)) item->allistrue = true; else - memcpy((void *) item->sign, (void *) GETSIGN(key), siglen); + memcpy(item->sign, GETSIGN(key), siglen); } #define WISH_F(a,b,c) (double)( -(double)(((a)-(b))*((a)-(b))*((a)-(b)))*(c) ) diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml index 52e5aa17bf..e2a5496c34 100644 --- a/doc/src/sgml/xfunc.sgml +++ b/doc/src/sgml/xfunc.sgml @@ -2456,8 +2456,8 @@ Version 1 Calling Conventions * VARDATA is a pointer to the data region of the new struct. The source * could be a short datum, so retrieve its data through VARDATA_ANY. */ - memcpy((void *) VARDATA(new_t), /* destination */ - (void *) VARDATA_ANY(t), /* source */ + memcpy(VARDATA(new_t), /* destination */ + VARDATA_ANY(t), /* source */ VARSIZE_ANY_EXHDR(t)); /* how many bytes */ PG_RETURN_TEXT_P(new_t); } diff --git a/src/backend/access/gist/gistproc.c b/src/backend/access/gist/gistproc.c index eb9178d456..4881034069 100644 --- a/src/backend/access/gist/gistproc.c +++ b/src/backend/access/gist/gistproc.c @@ -173,7 +173,7 @@ gist_box_union(PG_FUNCTION_ARGS) numranges = entryvec->n; pageunion = (BOX *) palloc(sizeof(BOX)); cur = DatumGetBoxP(entryvec->vector[0].key); - memcpy((void *) pageunion, (void *) cur, sizeof(BOX)); + memcpy(pageunion, cur, sizeof(BOX)); for (i = 1; i < numranges; i++) { @@ -1043,7 +1043,7 @@ gist_poly_compress(PG_FUNCTION_ARGS) BOX *r; r = (BOX *) palloc(sizeof(BOX)); - memcpy((void *) r, (void *) &(in->boundbox), sizeof(BOX)); + memcpy(r, &(in->boundbox), sizeof(BOX)); retval = (GISTENTRY *) palloc(sizeof(GISTENTRY)); gistentryinit(*retval, PointerGetDatum(r), diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index 4340bf9641..a7071b2fce 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -2394,7 +2394,7 @@ GetSnapshotData(Snapshot snapshot) pg_read_barrier(); /* pairs with GetNewTransactionId */ memcpy(snapshot->subxip + subcount, - (void *) proc->subxids.xids, + proc->subxids.xids, nsubxids * sizeof(TransactionId)); subcount += nsubxids; } @@ -2846,7 +2846,7 @@ GetRunningTransactionData(void) /* barrier not really required, as XidGenLock is held, but ... */ pg_read_barrier(); /* pairs with GetNewTransactionId */ - memcpy(&xids[count], (void *) proc->subxids.xids, + memcpy(&xids[count], proc->subxids.xids, nsubxids * sizeof(TransactionId)); count += nsubxids; subcount += nsubxids; diff --git a/src/backend/utils/adt/tsgistidx.c b/src/backend/utils/adt/tsgistidx.c index a360b26ee2..e27e08d996 100644 --- a/src/backend/utils/adt/tsgistidx.c +++ b/src/backend/utils/adt/tsgistidx.c @@ -577,7 +577,7 @@ fillcache(CACHESIGN *item, SignTSVector *key, int siglen) else if (ISALLTRUE(key)) item->allistrue = true; else - memcpy((void *) item->sign, (void *) GETSIGN(key), siglen); + memcpy(item->sign, GETSIGN(key), siglen); } #define WISH_F(a,b,c) (double)( -(double)(((a)-(b))*((a)-(b))*((a)-(b)))*(c) ) diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c index e22a2c20a0..67ad876a27 100644 --- a/src/backend/utils/adt/tsquery.c +++ b/src/backend/utils/adt/tsquery.c @@ -605,7 +605,7 @@ pushValue(TSQueryParserState state, char *strval, int lenval, int16 weight, bool state->op = (char *) repalloc(state->op, state->lenop); state->curop = state->op + used; } - memcpy((void *) state->curop, (void *) strval, lenval); + memcpy(state->curop, strval, lenval); state->curop += lenval; *(state->curop) = '\0'; state->curop++; @@ -924,7 +924,7 @@ parse_tsquery(char *buf, } /* Copy all the operand strings to TSQuery */ - memcpy((void *) GETOPERAND(query), (void *) state.op, state.sumlen); + memcpy(GETOPERAND(query), state.op, state.sumlen); pfree(state.op); /* diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c index 7b9210c321..dc31665770 100644 --- a/src/backend/utils/adt/tsquery_cleanup.c +++ b/src/backend/utils/adt/tsquery_cleanup.c @@ -69,7 +69,7 @@ plainnode(PLAINTREE *state, NODE *node) state->len *= 2; state->ptr = (QueryItem *) repalloc(state->ptr, state->len * sizeof(QueryItem)); } - memcpy((void *) &(state->ptr[state->cur]), (void *) node->valnode, sizeof(QueryItem)); + memcpy(&(state->ptr[state->cur]), node->valnode, sizeof(QueryItem)); if (node->valnode->type == QI_VAL) state->cur++; else if (node->valnode->qoperator.oper == OP_NOT) diff --git a/src/backend/utils/adt/tsvector.c b/src/backend/utils/adt/tsvector.c index 77673864a2..e5b05960e3 100644 --- a/src/backend/utils/adt/tsvector.c +++ b/src/backend/utils/adt/tsvector.c @@ -244,7 +244,7 @@ tsvectorin(PG_FUNCTION_ARGS) } arr[len].entry.len = toklen; arr[len].entry.pos = cur - tmpbuf; - memcpy((void *) cur, (void *) token, toklen); + memcpy(cur, token, toklen); cur += toklen; if (poslen != 0) diff --git a/src/tutorial/funcs.c b/src/tutorial/funcs.c index cdd155ebbd..ceffb56835 100644 --- a/src/tutorial/funcs.c +++ b/src/tutorial/funcs.c @@ -78,8 +78,8 @@ copytext(PG_FUNCTION_ARGS) * VARDATA is a pointer to the data region of the new struct. The source * could be a short datum, so retrieve its data through VARDATA_ANY. */ - memcpy((void *) VARDATA(new_t), /* destination */ - (void *) VARDATA_ANY(t), /* source */ + memcpy(VARDATA(new_t), /* destination */ + VARDATA_ANY(t), /* source */ VARSIZE_ANY_EXHDR(t)); /* how many bytes */ PG_RETURN_TEXT_P(new_t); } -- 2.39.1