Skip to content

Commit 37d9916

Browse files
peterepetere
committed
More unconstify use
Replace casts whose only purpose is to cast away const with the unconstify() macro. Discussion: https://www.postgresql.org/message-id/flat/53a28052-f9f3-1808-fed9-460fd43035ab%402ndquadrant.com
1 parent cf40dc6 commit 37d9916

File tree

25 files changed

+57
-55
lines changed

25 files changed

+57
-55
lines changed

‎contrib/btree_gist/btree_utils_num.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ gbt_num_union(GBT_NUMKEY *out, const GistEntryVector *entryvec, const gbtree_nin
185185
c.upper = &cur[tinfo->size];
186186
/* if out->lower > cur->lower, adopt cur as lower */
187187
if (tinfo->f_gt(o.lower, c.lower, flinfo))
188-
memcpy((void *) o.lower, c.lower, tinfo->size);
188+
memcpy(unconstify(GBT_NUMKEY *, o.lower), c.lower, tinfo->size);
189189
/* if out->upper < cur->upper, adopt cur as upper */
190190
if (tinfo->f_lt(o.upper, c.upper, flinfo))
191-
memcpy((void *) o.upper, c.upper, tinfo->size);
191+
memcpy(unconstify(GBT_NUMKEY *, o.upper), c.upper, tinfo->size);
192192
}
193193

194194
return out;
@@ -237,9 +237,9 @@ gbt_num_bin_union(Datum *u, GBT_NUMKEY *e, const gbtree_ninfo *tinfo, FmgrInfo *
237237
ur.lower = &(((GBT_NUMKEY *) DatumGetPointer(*u))[0]);
238238
ur.upper = &(((GBT_NUMKEY *) DatumGetPointer(*u))[tinfo->size]);
239239
if (tinfo->f_gt(ur.lower, rd.lower, flinfo))
240-
memcpy((void *) ur.lower, rd.lower, tinfo->size);
240+
memcpy(unconstify(GBT_NUMKEY *, ur.lower), rd.lower, tinfo->size);
241241
if (tinfo->f_lt(ur.upper, rd.upper, flinfo))
242-
memcpy((void *) ur.upper, rd.upper, tinfo->size);
242+
memcpy(unconstify(GBT_NUMKEY *, ur.upper), rd.upper, tinfo->size);
243243
}
244244
}
245245

‎contrib/pgcrypto/imath.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2050,7 +2050,7 @@ mp_int_read_cstring(mp_int z, mp_size radix, const char *str, char **end)
20502050
MP_SIGN(z) = MP_ZPOS;
20512051

20522052
if (end != NULL)
2053-
*end = (char *) str;
2053+
*end = unconstify(char *, str);
20542054

20552055
/*
20562056
* Return a truncation error if the string has unprocessed characters

‎contrib/pgcrypto/md5.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ md5_loop(md5_ctxt *ctxt, const uint8 *input, unsigned len)
161161
md5_calc(ctxt->md5_buf, ctxt);
162162

163163
for (i = gap; i + MD5_BUFLEN <= len; i += MD5_BUFLEN)
164-
md5_calc((uint8 *) (input + i), ctxt);
164+
md5_calc(unconstify(uint8 *, (input + i)), ctxt);
165165

166166
ctxt->md5_i = len - i;
167167
memmove(ctxt->md5_buf, input + i, ctxt->md5_i);

‎contrib/pgcrypto/pgp-compress.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ compress_process(PushFilter *next, void *priv, const uint8 *data, int len)
117117
*/
118118
while (len > 0)
119119
{
120-
st->stream.next_in = (void *) data;
120+
st->stream.next_in = unconstify(uint8 *, data);
121121
st->stream.avail_in = len;
122122
st->stream.next_out = st->buf;
123123
st->stream.avail_out = st->buf_len;

‎src/backend/access/brin/brin_pageops.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange,
178178
brin_can_do_samepage_update(oldbuf, origsz, newsz))
179179
{
180180
START_CRIT_SECTION();
181-
if (!PageIndexTupleOverwrite(oldpage, oldoff, (Item) newtup, newsz))
181+
if (!PageIndexTupleOverwrite(oldpage, oldoff, (Item) unconstify(BrinTuple *, newtup), newsz))
182182
elog(ERROR, "failed to replace BRIN tuple");
183183
MarkBufferDirty(oldbuf);
184184

@@ -195,7 +195,7 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange,
195195
XLogRegisterData((char *) &xlrec, SizeOfBrinSamepageUpdate);
196196

197197
XLogRegisterBuffer(0, oldbuf, REGBUF_STANDARD);
198-
XLogRegisterBufData(0, (char *) newtup, newsz);
198+
XLogRegisterBufData(0, (char *) unconstify(BrinTuple *, newtup), newsz);
199199

200200
recptr = XLogInsert(RM_BRIN_ID, info);
201201

@@ -252,7 +252,7 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange,
252252
brin_page_init(newpage, BRIN_PAGETYPE_REGULAR);
253253

254254
PageIndexTupleDeleteNoCompact(oldpage, oldoff);
255-
newoff = PageAddItem(newpage, (Item) newtup, newsz,
255+
newoff = PageAddItem(newpage, (Item) unconstify(BrinTuple *, newtup), newsz,
256256
InvalidOffsetNumber, false, false);
257257
if (newoff == InvalidOffsetNumber)
258258
elog(ERROR, "failed to add BRIN tuple to new page");
@@ -287,7 +287,7 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange,
287287
XLogRegisterData((char *) &xlrec, SizeOfBrinUpdate);
288288

289289
XLogRegisterBuffer(0, newbuf, REGBUF_STANDARD | (extended ? REGBUF_WILL_INIT : 0));
290-
XLogRegisterBufData(0, (char *) newtup, newsz);
290+
XLogRegisterBufData(0, (char *) unconstify(BrinTuple *, newtup), newsz);
291291

292292
/* revmap page */
293293
XLogRegisterBuffer(1, revmapbuf, 0);

‎src/backend/access/transam/xact.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5409,7 +5409,7 @@ XactLogCommitRecord(TimestampTz commit_time,
54095409
{
54105410
XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));
54115411
if (xl_xinfo.xinfo & XACT_XINFO_HAS_GID)
5412-
XLogRegisterData((char *) twophase_gid, strlen(twophase_gid) + 1);
5412+
XLogRegisterData(unconstify(char *, twophase_gid), strlen(twophase_gid) + 1);
54135413
}
54145414

54155415
if (xl_xinfo.xinfo & XACT_XINFO_HAS_ORIGIN)
@@ -5537,7 +5537,7 @@ XactLogAbortRecord(TimestampTz abort_time,
55375537
{
55385538
XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));
55395539
if (xl_xinfo.xinfo & XACT_XINFO_HAS_GID)
5540-
XLogRegisterData((char *) twophase_gid, strlen(twophase_gid) + 1);
5540+
XLogRegisterData(unconstify(char *, twophase_gid), strlen(twophase_gid) + 1);
55415541
}
55425542

55435543
if (xl_xinfo.xinfo & XACT_XINFO_HAS_ORIGIN)

‎src/backend/executor/spi.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,7 +1314,7 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
13141314
* throws an error.
13151315
*/
13161316
spierrcontext.callback = _SPI_error_callback;
1317-
spierrcontext.arg = (void *) plansource->query_string;
1317+
spierrcontext.arg = unconstify(char *, plansource->query_string);
13181318
spierrcontext.previous = error_context_stack;
13191319
error_context_stack = &spierrcontext;
13201320

@@ -1753,7 +1753,7 @@ SPI_plan_get_cached_plan(SPIPlanPtr plan)
17531753

17541754
/* Setup error traceback support for ereport() */
17551755
spierrcontext.callback = _SPI_error_callback;
1756-
spierrcontext.arg = (void *) plansource->query_string;
1756+
spierrcontext.arg = unconstify(char *, plansource->query_string);
17571757
spierrcontext.previous = error_context_stack;
17581758
error_context_stack = &spierrcontext;
17591759

@@ -1884,7 +1884,7 @@ _SPI_prepare_plan(const char *src, SPIPlanPtr plan)
18841884
* Setup error traceback support for ereport()
18851885
*/
18861886
spierrcontext.callback = _SPI_error_callback;
1887-
spierrcontext.arg = (void *) src;
1887+
spierrcontext.arg = unconstify(char *, src);
18881888
spierrcontext.previous = error_context_stack;
18891889
error_context_stack = &spierrcontext;
18901890

@@ -1989,7 +1989,7 @@ _SPI_prepare_oneshot_plan(const char *src, SPIPlanPtr plan)
19891989
* Setup error traceback support for ereport()
19901990
*/
19911991
spierrcontext.callback = _SPI_error_callback;
1992-
spierrcontext.arg = (void *) src;
1992+
spierrcontext.arg = unconstify(char *, src);
19931993
spierrcontext.previous = error_context_stack;
19941994
error_context_stack = &spierrcontext;
19951995

@@ -2100,7 +2100,7 @@ _SPI_execute_plan(SPIPlanPtr plan, ParamListInfo paramLI,
21002100
List *stmt_list;
21012101
ListCell *lc2;
21022102

2103-
spierrcontext.arg = (void *) plansource->query_string;
2103+
spierrcontext.arg = unconstify(char *, plansource->query_string);
21042104

21052105
/*
21062106
* If this is a one-shot plan, we still need to do parse analysis.

‎src/backend/libpq/auth.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ CheckSCRAMAuth(Port *port, char *shadow_pass, char **logdetail)
867867
void *scram_opaq = NULL;
868868
char *output = NULL;
869869
int outputlen = 0;
870-
char *input;
870+
const char *input;
871871
int inputlen;
872872
int result;
873873
bool initial;
@@ -964,14 +964,14 @@ CheckSCRAMAuth(Port *port, char *shadow_pass, char **logdetail)
964964
if (inputlen == -1)
965965
input = NULL;
966966
else
967-
input = (char *) pq_getmsgbytes(&buf, inputlen);
967+
input = pq_getmsgbytes(&buf, inputlen);
968968

969969
initial = false;
970970
}
971971
else
972972
{
973973
inputlen = buf.len;
974-
input = (char *) pq_getmsgbytes(&buf, buf.len);
974+
input = pq_getmsgbytes(&buf, buf.len);
975975
}
976976
pq_getmsgend(&buf);
977977

@@ -985,7 +985,7 @@ CheckSCRAMAuth(Port *port, char *shadow_pass, char **logdetail)
985985
* we pass 'logdetail' as NULL when doing a mock authentication,
986986
* because we should already have a better error message in that case
987987
*/
988-
result = pg_be_scram_exchange(scram_opaq, input, inputlen,
988+
result = pg_be_scram_exchange(scram_opaq, unconstify(char *, input), inputlen,
989989
&output, &outputlen,
990990
logdetail);
991991

@@ -2175,7 +2175,7 @@ CheckPAMAuth(Port *port, const char *user, const char *password)
21752175
* later used inside the PAM conversation to pass the password to the
21762176
* authentication module.
21772177
*/
2178-
pam_passw_conv.appdata_ptr = (char *) password; /* from password above,
2178+
pam_passw_conv.appdata_ptr = unconstify(char *, password); /* from password above,
21792179
* not allocated */
21802180

21812181
/* Optionally, one can set the service name in pg_hba.conf */

‎src/backend/libpq/be-secure-openssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ load_dh_buffer(const char *buffer, size_t len)
866866
BIO *bio;
867867
DH *dh = NULL;
868868

869-
bio = BIO_new_mem_buf((char *) buffer, len);
869+
bio = BIO_new_mem_buf(unconstify(char *, buffer), len);
870870
if (bio == NULL)
871871
return NULL;
872872
dh = PEM_read_bio_DHparams(bio, NULL, NULL, NULL);

‎src/backend/parser/parse_type.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ typeStringToTypeName(const char *str)
739739
* Setup error traceback support in case of ereport() during parse
740740
*/
741741
ptserrcontext.callback = pts_error_callback;
742-
ptserrcontext.arg = (void *) str;
742+
ptserrcontext.arg = unconstify(char *, str);
743743
ptserrcontext.previous = error_context_stack;
744744
error_context_stack = &ptserrcontext;
745745

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy