From 597d41490d8eda8e3d9361ae39788813828712fc Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 2 Feb 2023 23:02:35 +0100 Subject: [PATCH 2/8] Remove useless casts to (void *) (repalloc) --- contrib/ltree/ltxtquery_io.c | 2 +- src/backend/access/gist/gistutil.c | 2 +- src/backend/tsearch/spell.c | 4 ++-- src/backend/tsearch/ts_parse.c | 6 +++--- src/backend/tsearch/ts_utils.c | 2 +- src/backend/utils/adt/tsgistidx.c | 2 +- src/backend/utils/adt/tsquery.c | 2 +- src/backend/utils/adt/tsquery_cleanup.c | 2 +- src/backend/utils/adt/tsvector.c | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c index d9910e6c99..82d617f1ae 100644 --- a/contrib/ltree/ltxtquery_io.c +++ b/contrib/ltree/ltxtquery_io.c @@ -195,7 +195,7 @@ pushval_asis(QPRS_STATE *state, int type, char *strval, int lenval, uint16 flag) int32 tmp = state->curop - state->op; state->lenop *= 2; - state->op = (char *) repalloc((void *) state->op, state->lenop); + state->op = (char *) repalloc(state->op, state->lenop); state->curop = state->op + tmp; } memcpy((void *) state->curop, (void *) strval, lenval); diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c index 56451fede1..b4d843a0ff 100644 --- a/src/backend/access/gist/gistutil.c +++ b/src/backend/access/gist/gistutil.c @@ -113,7 +113,7 @@ gistextractpage(Page page, int *len /* out */ ) IndexTuple * gistjoinvector(IndexTuple *itvec, int *len, IndexTuple *additvec, int addlen) { - itvec = (IndexTuple *) repalloc((void *) itvec, sizeof(IndexTuple) * ((*len) + addlen)); + itvec = (IndexTuple *) repalloc(itvec, sizeof(IndexTuple) * ((*len) + addlen)); memmove(&itvec[*len], additvec, sizeof(IndexTuple) * addlen); *len += addlen; return itvec; diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c index 83838ab438..c8dfed6178 100644 --- a/src/backend/tsearch/spell.c +++ b/src/backend/tsearch/spell.c @@ -695,7 +695,7 @@ NIAddAffix(IspellDict *Conf, const char *flag, char flagflags, const char *mask, if (Conf->maffixes) { Conf->maffixes *= 2; - Conf->Affix = (AFFIX *) repalloc((void *) Conf->Affix, Conf->maffixes * sizeof(AFFIX)); + Conf->Affix = (AFFIX *) repalloc(Conf->Affix, Conf->maffixes * sizeof(AFFIX)); } else { @@ -1116,7 +1116,7 @@ addCompoundAffixFlagValue(IspellDict *Conf, char *s, uint32 val) { Conf->mCompoundAffixFlag *= 2; Conf->CompoundAffixFlags = (CompoundAffixFlag *) - repalloc((void *) Conf->CompoundAffixFlags, + repalloc(Conf->CompoundAffixFlags, Conf->mCompoundAffixFlag * sizeof(CompoundAffixFlag)); } else diff --git a/src/backend/tsearch/ts_parse.c b/src/backend/tsearch/ts_parse.c index 9b6d934958..25d9852778 100644 --- a/src/backend/tsearch/ts_parse.c +++ b/src/backend/tsearch/ts_parse.c @@ -410,7 +410,7 @@ parsetext(Oid cfgId, ParsedText *prs, char *buf, int buflen) if (prs->curwords == prs->lenwords) { prs->lenwords *= 2; - prs->words = (ParsedWord *) repalloc((void *) prs->words, prs->lenwords * sizeof(ParsedWord)); + prs->words = (ParsedWord *) repalloc(prs->words, prs->lenwords * sizeof(ParsedWord)); } if (ptr->flags & TSL_ADDPOS) @@ -442,7 +442,7 @@ hladdword(HeadlineParsedText *prs, char *buf, int buflen, int type) if (prs->curwords >= prs->lenwords) { prs->lenwords *= 2; - prs->words = (HeadlineWordEntry *) repalloc((void *) prs->words, prs->lenwords * sizeof(HeadlineWordEntry)); + prs->words = (HeadlineWordEntry *) repalloc(prs->words, prs->lenwords * sizeof(HeadlineWordEntry)); } memset(&(prs->words[prs->curwords]), 0, sizeof(HeadlineWordEntry)); prs->words[prs->curwords].type = (uint8) type; @@ -470,7 +470,7 @@ hlfinditem(HeadlineParsedText *prs, TSQuery query, int32 pos, char *buf, int buf while (prs->curwords + query->size >= prs->lenwords) { prs->lenwords *= 2; - prs->words = (HeadlineWordEntry *) repalloc((void *) prs->words, prs->lenwords * sizeof(HeadlineWordEntry)); + prs->words = (HeadlineWordEntry *) repalloc(prs->words, prs->lenwords * sizeof(HeadlineWordEntry)); } word = &(prs->words[prs->curwords - 1]); diff --git a/src/backend/tsearch/ts_utils.c b/src/backend/tsearch/ts_utils.c index bb954184d3..c46867d074 100644 --- a/src/backend/tsearch/ts_utils.c +++ b/src/backend/tsearch/ts_utils.c @@ -109,7 +109,7 @@ readstoplist(const char *fname, StopList *s, char *(*wordop) (const char *)) else { reallen *= 2; - stop = (char **) repalloc((void *) stop, + stop = (char **) repalloc(stop, sizeof(char *) * reallen); } } diff --git a/src/backend/utils/adt/tsgistidx.c b/src/backend/utils/adt/tsgistidx.c index f0411bf48f..a360b26ee2 100644 --- a/src/backend/utils/adt/tsgistidx.c +++ b/src/backend/utils/adt/tsgistidx.c @@ -204,7 +204,7 @@ gtsvector_compress(PG_FUNCTION_ARGS) * val->size */ len = CALCGTSIZE(ARRKEY, len); - res = (SignTSVector *) repalloc((void *) res, len); + res = (SignTSVector *) repalloc(res, len); SET_VARSIZE(res, len); } diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c index 25150c6d16..e22a2c20a0 100644 --- a/src/backend/utils/adt/tsquery.c +++ b/src/backend/utils/adt/tsquery.c @@ -602,7 +602,7 @@ pushValue(TSQueryParserState state, char *strval, int lenval, int16 weight, bool int used = state->curop - state->op; state->lenop *= 2; - state->op = (char *) repalloc((void *) state->op, state->lenop); + state->op = (char *) repalloc(state->op, state->lenop); state->curop = state->op + used; } memcpy((void *) state->curop, (void *) strval, lenval); diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c index 59b3e859c3..7b9210c321 100644 --- a/src/backend/utils/adt/tsquery_cleanup.c +++ b/src/backend/utils/adt/tsquery_cleanup.c @@ -67,7 +67,7 @@ plainnode(PLAINTREE *state, NODE *node) if (state->cur == state->len) { state->len *= 2; - state->ptr = (QueryItem *) repalloc((void *) state->ptr, state->len * sizeof(QueryItem)); + state->ptr = (QueryItem *) repalloc(state->ptr, state->len * sizeof(QueryItem)); } memcpy((void *) &(state->ptr[state->cur]), (void *) node->valnode, sizeof(QueryItem)); if (node->valnode->type == QI_VAL) diff --git a/src/backend/utils/adt/tsvector.c b/src/backend/utils/adt/tsvector.c index c7e20ce4ec..77673864a2 100644 --- a/src/backend/utils/adt/tsvector.c +++ b/src/backend/utils/adt/tsvector.c @@ -232,14 +232,14 @@ tsvectorin(PG_FUNCTION_ARGS) { arrlen *= 2; arr = (WordEntryIN *) - repalloc((void *) arr, sizeof(WordEntryIN) * arrlen); + repalloc(arr, sizeof(WordEntryIN) * arrlen); } while ((cur - tmpbuf) + toklen >= buflen) { int dist = cur - tmpbuf; buflen *= 2; - tmpbuf = (char *) repalloc((void *) tmpbuf, buflen); + tmpbuf = (char *) repalloc(tmpbuf, buflen); cur = tmpbuf + dist; } arr[len].entry.len = toklen; -- 2.39.1