From ac0833f8a98d4561c0378fbf98345307b578bcbf Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 2 Feb 2023 23:02:34 +0100 Subject: [PATCH 4/8] Remove useless casts to (void *) (memset) --- contrib/hstore/hstore_gist.c | 4 ++-- contrib/intarray/_intbig_gist.c | 4 ++-- contrib/ltree/_ltree_gist.c | 4 ++-- contrib/pg_trgm/trgm_gist.c | 6 +++--- src/backend/tsearch/ts_utils.c | 3 +-- src/backend/utils/adt/tsgistidx.c | 6 +++--- src/bin/pg_dump/parallel.c | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c index 5d8b806d30..d31da564fe 100644 --- a/contrib/hstore/hstore_gist.c +++ b/contrib/hstore/hstore_gist.c @@ -465,7 +465,7 @@ ghstore_picksplit(PG_FUNCTION_ARGS) if (ISALLTRUE(datum_l) || ISALLTRUE(_j)) { if (!ISALLTRUE(datum_l)) - memset((void *) union_l, 0xff, siglen); + memset(union_l, 0xff, siglen); } else { @@ -481,7 +481,7 @@ ghstore_picksplit(PG_FUNCTION_ARGS) if (ISALLTRUE(datum_r) || ISALLTRUE(_j)) { if (!ISALLTRUE(datum_r)) - memset((void *) union_r, 0xff, siglen); + memset(union_r, 0xff, siglen); } else { diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c index dadc18646a..f8fca44ea5 100644 --- a/contrib/intarray/_intbig_gist.c +++ b/contrib/intarray/_intbig_gist.c @@ -424,7 +424,7 @@ g_intbig_picksplit(PG_FUNCTION_ARGS) if (ISALLTRUE(datum_l) || ISALLTRUE(_j)) { if (!ISALLTRUE(datum_l)) - memset((void *) union_l, 0xff, siglen); + memset(union_l, 0xff, siglen); } else { @@ -440,7 +440,7 @@ g_intbig_picksplit(PG_FUNCTION_ARGS) if (ISALLTRUE(datum_r) || ISALLTRUE(_j)) { if (!ISALLTRUE(datum_r)) - memset((void *) union_r, 0xff, siglen); + memset(union_r, 0xff, siglen); } else { diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c index 385a10283b..4d9ee53f08 100644 --- a/contrib/ltree/_ltree_gist.c +++ b/contrib/ltree/_ltree_gist.c @@ -348,7 +348,7 @@ _ltree_picksplit(PG_FUNCTION_ARGS) if (LTG_ISALLTRUE(datum_l) || LTG_ISALLTRUE(_j)) { if (!LTG_ISALLTRUE(datum_l)) - memset((void *) union_l, 0xff, siglen); + memset(union_l, 0xff, siglen); } else { @@ -364,7 +364,7 @@ _ltree_picksplit(PG_FUNCTION_ARGS) if (LTG_ISALLTRUE(datum_r) || LTG_ISALLTRUE(_j)) { if (!LTG_ISALLTRUE(datum_r)) - memset((void *) union_r, 0xff, siglen); + memset(union_r, 0xff, siglen); } else { diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c index 68ebf1767b..ed2b010b93 100644 --- a/contrib/pg_trgm/trgm_gist.c +++ b/contrib/pg_trgm/trgm_gist.c @@ -102,7 +102,7 @@ makesign(BITVECP sign, TRGM *a, int siglen) trgm *ptr = GETARR(a); int32 tmp = 0; - MemSet((void *) sign, 0, siglen); + MemSet(sign, 0, siglen); SETBIT(sign, SIGLENBIT(siglen)); /* set last unused bit */ for (k = 0; k < len; k++) { @@ -921,7 +921,7 @@ gtrgm_picksplit(PG_FUNCTION_ARGS) if (ISALLTRUE(datum_l) || cache[j].allistrue) { if (!ISALLTRUE(datum_l)) - memset((void *) GETSIGN(datum_l), 0xff, siglen); + memset(GETSIGN(datum_l), 0xff, siglen); } else { @@ -937,7 +937,7 @@ gtrgm_picksplit(PG_FUNCTION_ARGS) if (ISALLTRUE(datum_r) || cache[j].allistrue) { if (!ISALLTRUE(datum_r)) - memset((void *) GETSIGN(datum_r), 0xff, siglen); + memset(GETSIGN(datum_r), 0xff, siglen); } else { diff --git a/src/backend/tsearch/ts_utils.c b/src/backend/tsearch/ts_utils.c index c46867d074..7c4c2a9112 100644 --- a/src/backend/tsearch/ts_utils.c +++ b/src/backend/tsearch/ts_utils.c @@ -109,8 +109,7 @@ readstoplist(const char *fname, StopList *s, char *(*wordop) (const char *)) else { reallen *= 2; - stop = (char **) repalloc(stop, - sizeof(char *) * reallen); + stop = (char **) repalloc(stop, sizeof(char *) * reallen); } } diff --git a/src/backend/utils/adt/tsgistidx.c b/src/backend/utils/adt/tsgistidx.c index e27e08d996..ca4563290f 100644 --- a/src/backend/utils/adt/tsgistidx.c +++ b/src/backend/utils/adt/tsgistidx.c @@ -143,7 +143,7 @@ makesign(BITVECP sign, SignTSVector *a, int siglen) len = ARRNELEM(a); int32 *ptr = GETARR(a); - MemSet((void *) sign, 0, siglen); + MemSet(sign, 0, siglen); for (k = 0; k < len; k++) HASH(sign, ptr[k], siglen); } @@ -755,7 +755,7 @@ gtsvector_picksplit(PG_FUNCTION_ARGS) if (ISALLTRUE(datum_l) || cache[j].allistrue) { if (!ISALLTRUE(datum_l)) - memset((void *) GETSIGN(datum_l), 0xff, siglen); + memset(GETSIGN(datum_l), 0xff, siglen); } else { @@ -771,7 +771,7 @@ gtsvector_picksplit(PG_FUNCTION_ARGS) if (ISALLTRUE(datum_r) || cache[j].allistrue) { if (!ISALLTRUE(datum_r)) - memset((void *) GETSIGN(datum_r), 0xff, siglen); + memset(GETSIGN(datum_r), 0xff, siglen); } else { diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c index 9bfb95557a..da0723ad38 100644 --- a/src/bin/pg_dump/parallel.c +++ b/src/bin/pg_dump/parallel.c @@ -1736,7 +1736,7 @@ pgpipe(int handles[2]) return -1; } - memset((void *) &serv_addr, 0, sizeof(serv_addr)); + memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sin_family = AF_INET; serv_addr.sin_port = pg_hton16(0); serv_addr.sin_addr.s_addr = pg_hton32(INADDR_LOOPBACK); -- 2.39.1