From cec624866019246f7c14a8110eac76de6906b4d6 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 18 Aug 2026 10:52:24 +0200 Subject: [PATCH 06/11] Fix some -Wcast-qual warnings [btree_gist] Some small adjustments to avoid having to cast away const qualifiers. --- contrib/btree_gist/btree_bit.c | 4 ++-- contrib/btree_gist/btree_utils_var.c | 4 ++-- contrib/btree_gist/btree_utils_var.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/btree_gist/btree_bit.c b/contrib/btree_gist/btree_bit.c index 5fb8c8b82f0..434a5f7e430 100644 --- a/contrib/btree_gist/btree_bit.c +++ b/contrib/btree_gist/btree_bit.c @@ -98,7 +98,7 @@ gbt_bitcmp(const void *a, const void *b, Oid collation, FmgrInfo *flinfo) * descend to that leaf page. */ static bytea * -gbt_bit_xfrm(VarBit *leaf) +gbt_bit_xfrm(const VarBit *leaf) { bytea *out; int sz = VARBITBYTES(leaf) + VARHDRSZ; @@ -125,7 +125,7 @@ gbt_bit_l2n(GBT_VARKEY *leaf, FmgrInfo *flinfo) GBT_VARKEY_R r = gbt_var_key_readable(leaf); bytea *o; - o = gbt_bit_xfrm((VarBit *) r.lower); + o = gbt_bit_xfrm((const VarBit *) r.lower); r.upper = r.lower = o; out = gbt_var_key_copy(&r); pfree(o); diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c index 3eeaee6bc35..efa6e09aa53 100644 --- a/contrib/btree_gist/btree_utils_var.c +++ b/contrib/btree_gist/btree_utils_var.c @@ -62,9 +62,9 @@ gbt_var_key_readable(const GBT_VARKEY *k) { GBT_VARKEY_R r; - r.lower = (bytea *) &(((char *) k)[VARHDRSZ]); + r.lower = (const bytea *) &(((const char *) k)[VARHDRSZ]); if (VARSIZE(k) > (VARHDRSZ + (VARSIZE(r.lower)))) - r.upper = (bytea *) &(((char *) k)[VARHDRSZ + INTALIGN(VARSIZE(r.lower))]); + r.upper = (const bytea *) &(((const char *) k)[VARHDRSZ + INTALIGN(VARSIZE(r.lower))]); else r.upper = r.lower; return r; diff --git a/contrib/btree_gist/btree_utils_var.h b/contrib/btree_gist/btree_utils_var.h index 2ed7eaa86b2..a12485b3098 100644 --- a/contrib/btree_gist/btree_utils_var.h +++ b/contrib/btree_gist/btree_utils_var.h @@ -26,7 +26,7 @@ typedef bytea GBT_VARKEY; */ typedef struct { - bytea *lower, + const bytea *lower, *upper; } GBT_VARKEY_R; -- 2.55.0