diff options
Diffstat (limited to 'src/backend/access')
| -rw-r--r-- | src/backend/access/brin/brin_minmax_multi.c | 6 | ||||
| -rw-r--r-- | src/backend/access/gin/ginutil.c | 2 | ||||
| -rw-r--r-- | src/backend/access/gist/gistproc.c | 4 | ||||
| -rw-r--r-- | src/backend/access/gist/gistutil.c | 2 | ||||
| -rw-r--r-- | src/backend/access/nbtree/nbtutils.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/access/brin/brin_minmax_multi.c b/src/backend/access/brin/brin_minmax_multi.c index ac670fd02d7..0ace6035beb 100644 --- a/src/backend/access/brin/brin_minmax_multi.c +++ b/src/backend/access/brin/brin_minmax_multi.c @@ -543,7 +543,7 @@ range_deduplicate_values(Ranges *range) */ qsort_arg(&range->values[start], range->nvalues, sizeof(Datum), - compare_values, (void *) &cxt); + compare_values, &cxt); n = 1; for (i = 1; i < range->nvalues; i++) @@ -1197,7 +1197,7 @@ sort_expanded_ranges(FmgrInfo *cmp, Oid colloid, * some of the points) and do merge sort. */ qsort_arg(eranges, neranges, sizeof(ExpandedRange), - compare_expanded_ranges, (void *) &cxt); + compare_expanded_ranges, &cxt); /* * Deduplicate the ranges - simply compare each range to the preceding @@ -1535,7 +1535,7 @@ reduce_expanded_ranges(ExpandedRange *eranges, int neranges, * sorted result. */ qsort_arg(values, nvalues, sizeof(Datum), - compare_values, (void *) &cxt); + compare_values, &cxt); /* We have nvalues boundary values, which means nvalues/2 ranges. */ for (i = 0; i < (nvalues / 2); i++) diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c index e7cc452a8aa..f05128ecf50 100644 --- a/src/backend/access/gin/ginutil.c +++ b/src/backend/access/gin/ginutil.c @@ -560,7 +560,7 @@ ginExtractEntries(GinState *ginstate, OffsetNumber attnum, arg.collation = ginstate->supportCollation[attnum - 1]; arg.haveDups = false; qsort_arg(keydata, *nentries, sizeof(keyEntryData), - cmpEntries, (void *) &arg); + cmpEntries, &arg); if (arg.haveDups) { diff --git a/src/backend/access/gist/gistproc.c b/src/backend/access/gist/gistproc.c index eb9178d4560..4881034069b 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/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c index 56451fede10..b4d843a0ff1 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/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c index 8003583c0ae..7da499c4dd5 100644 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@ -488,8 +488,8 @@ _bt_sort_array_elements(IndexScanDesc scan, ScanKey skey, fmgr_info(cmp_proc, &cxt.flinfo); cxt.collation = skey->sk_collation; cxt.reverse = reverse; - qsort_arg((void *) elems, nelems, sizeof(Datum), - _bt_compare_array_elements, (void *) &cxt); + qsort_arg(elems, nelems, sizeof(Datum), + _bt_compare_array_elements, &cxt); /* Now scan the sorted elements and remove duplicates */ return qunique_arg(elems, nelems, sizeof(Datum), |