diff options
Diffstat (limited to 'contrib/btree_gist')
| -rw-r--r-- | contrib/btree_gist/btree_bit.c | 2 | ||||
| -rw-r--r-- | contrib/btree_gist/btree_interval.c | 4 | ||||
| -rw-r--r-- | contrib/btree_gist/btree_utils_num.c | 8 | ||||
| -rw-r--r-- | contrib/btree_gist/btree_utils_var.c | 4 | ||||
| -rw-r--r-- | contrib/btree_gist/btree_uuid.c | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/contrib/btree_gist/btree_bit.c b/contrib/btree_gist/btree_bit.c index 5b246bcde4b..6790f22b4b6 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 2c98b330cd7..b0afdf02bb5 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 05c154afa34..346ee837d75 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++) { @@ -360,7 +360,7 @@ gbt_num_picksplit(const GistEntryVector *entryvec, GIST_SPLITVEC *v, arr[i].t = (GBT_NUMKEY *) DatumGetPointer((entryvec->vector[i].key)); arr[i].i = i; } - qsort_arg((void *) &arr[FirstOffsetNumber], maxoff - FirstOffsetNumber + 1, sizeof(Nsrt), (qsort_arg_comparator) tinfo->f_cmp, (void *) flinfo); + qsort_arg(&arr[FirstOffsetNumber], maxoff - FirstOffsetNumber + 1, sizeof(Nsrt), (qsort_arg_comparator) tinfo->f_cmp, flinfo); /* We do simply create two parts */ diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c index 3ef82d0e208..0c0e952f736 100644 --- a/contrib/btree_gist/btree_utils_var.c +++ b/contrib/btree_gist/btree_utils_var.c @@ -502,11 +502,11 @@ gbt_var_picksplit(const GistEntryVector *entryvec, GIST_SPLITVEC *v, varg.tinfo = tinfo; varg.collation = collation; varg.flinfo = flinfo; - qsort_arg((void *) &arr[FirstOffsetNumber], + qsort_arg(&arr[FirstOffsetNumber], maxoff - FirstOffsetNumber + 1, sizeof(Vsrt), gbt_vsrt_cmp, - (void *) &varg); + &varg); /* We do simply create two parts */ diff --git a/contrib/btree_gist/btree_uuid.c b/contrib/btree_gist/btree_uuid.c index b81875979a3..fe8c679cbed 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); |