Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 3e4d868

Browse files
peterepetere
committed
Remove various unnecessary (char *) casts
Remove a number of (char *) casts that are unnecessary. Or in some cases, rewrite the code to make the purpose of the cast clearer. Reviewed-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org> Discussion: https://www.postgresql.org/message-id/flat/fd1fcedb-3492-4fc8-9e3e-74b97f2db6c7%40eisentraut.org
1 parent ab84d0f commit 3e4d868

File tree

18 files changed

+34
-32
lines changed

18 files changed

+34
-32
lines changed

‎contrib/ltree/ltxtquery_io.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ ltxtq_in(PG_FUNCTION_ARGS)
410410
{
411411
ltxtquery *res;
412412

413-
if ((res = queryin((char *) PG_GETARG_POINTER(0), fcinfo->context)) == NULL)
413+
if ((res = queryin(PG_GETARG_POINTER(0), fcinfo->context)) == NULL)
414414
PG_RETURN_NULL();
415415
PG_RETURN_POINTER(res);
416416
}

‎contrib/pg_trgm/trgm_gist.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ makesign(BITVECP sign, TRGM *a, int siglen)
106106
SETBIT(sign, SIGLENBIT(siglen)); /* set last unused bit */
107107
for (k = 0; k < len; k++)
108108
{
109-
CPTRGM(((char *) &tmp), ptr + k);
109+
CPTRGM(&tmp, ptr + k);
110110
HASH(sign, tmp, siglen);
111111
}
112112
}
@@ -186,7 +186,7 @@ cnt_sml_sign_common(TRGM *qtrg, BITVECP sign, int siglen)
186186

187187
for (k = 0; k < len; k++)
188188
{
189-
CPTRGM(((char *) &tmp), ptr + k);
189+
CPTRGM(&tmp, ptr + k);
190190
count += GETBIT(sign, HASHVAL(tmp, siglen));
191191
}
192192

@@ -373,7 +373,7 @@ gtrgm_consistent(PG_FUNCTION_ARGS)
373373
res = true;
374374
for (k = 0; k < len; k++)
375375
{
376-
CPTRGM(((char *) &tmp), ptr + k);
376+
CPTRGM(&tmp, ptr + k);
377377
if (!GETBIT(sign, HASHVAL(tmp, siglen)))
378378
{
379379
res = false;
@@ -426,7 +426,7 @@ gtrgm_consistent(PG_FUNCTION_ARGS)
426426
check = (bool *) palloc(len * sizeof(bool));
427427
for (k = 0; k < len; k++)
428428
{
429-
CPTRGM(((char *) &tmp), ptr + k);
429+
CPTRGM(&tmp, ptr + k);
430430
check[k] = GETBIT(sign, HASHVAL(tmp, siglen));
431431
}
432432
res = trigramsMatchGraph(cache->graph, check);
@@ -552,7 +552,7 @@ unionkey(BITVECP sbase, TRGM *add, int siglen)
552552

553553
for (i = 0; i < ARRNELEM(add); i++)
554554
{
555-
CPTRGM(((char *) &tmp), ptr + i);
555+
CPTRGM(&tmp, ptr + i);
556556
HASH(sbase, tmp, siglen);
557557
}
558558
}

‎contrib/postgres_fdw/postgres_fdw.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -5660,13 +5660,13 @@ postgresImportForeignSchema(ImportForeignSchemaStmt *stmt, Oid serverOid)
56605660
attname = PQgetvalue(res, i, 1);
56615661
typename = PQgetvalue(res, i, 2);
56625662
attnotnull = PQgetvalue(res, i, 3);
5663-
attdefault = PQgetisnull(res, i, 4) ? (char *) NULL :
5663+
attdefault = PQgetisnull(res, i, 4) ? NULL :
56645664
PQgetvalue(res, i, 4);
5665-
attgenerated = PQgetisnull(res, i, 5) ? (char *) NULL :
5665+
attgenerated = PQgetisnull(res, i, 5) ? NULL :
56665666
PQgetvalue(res, i, 5);
5667-
collname = PQgetisnull(res, i, 6) ? (char *) NULL :
5667+
collname = PQgetisnull(res, i, 6) ? NULL :
56685668
PQgetvalue(res, i, 6);
5669-
collnamespace = PQgetisnull(res, i, 7) ? (char *) NULL :
5669+
collnamespace = PQgetisnull(res, i, 7) ? NULL :
56705670
PQgetvalue(res, i, 7);
56715671

56725672
if (first_item)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4287,7 +4287,7 @@ WriteControlFile(void)
42874287
/* Contents are protected with a CRC */
42884288
INIT_CRC32C(ControlFile->crc);
42894289
COMP_CRC32C(ControlFile->crc,
4290-
(char *) ControlFile,
4290+
ControlFile,
42914291
offsetof(ControlFileData, crc));
42924292
FIN_CRC32C(ControlFile->crc);
42934293

@@ -4405,7 +4405,7 @@ ReadControlFile(void)
44054405
/* Now check the CRC. */
44064406
INIT_CRC32C(crc);
44074407
COMP_CRC32C(crc,
4408-
(char *) ControlFile,
4408+
ControlFile,
44094409
offsetof(ControlFileData, crc));
44104410
FIN_CRC32C(crc);
44114411

‎src/backend/libpq/auth.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -2932,8 +2932,8 @@ PerformRadiusTransaction(const char *server, const char *secret, const char *por
29322932
radius_packet radius_recv_pack;
29332933
radius_packet *packet = &radius_send_pack;
29342934
radius_packet *receivepacket = &radius_recv_pack;
2935-
char *radius_buffer = (char *) &radius_send_pack;
2936-
char *receive_buffer = (char *) &radius_recv_pack;
2935+
void *radius_buffer = &radius_send_pack;
2936+
void *receive_buffer = &radius_recv_pack;
29372937
int32 service = pg_hton32(RADIUS_AUTHENTICATE_ONLY);
29382938
uint8 *cryptvector;
29392939
int encryptedpasswordlen;
@@ -3204,7 +3204,9 @@ PerformRadiusTransaction(const char *server, const char *secret, const char *por
32043204
* original packet */
32053205
if (packetlength > RADIUS_HEADER_LENGTH) /* there may be no
32063206
* attributes at all */
3207-
memcpy(cryptvector + RADIUS_HEADER_LENGTH, receive_buffer + RADIUS_HEADER_LENGTH, packetlength - RADIUS_HEADER_LENGTH);
3207+
memcpy(cryptvector + RADIUS_HEADER_LENGTH,
3208+
(char *) receive_buffer + RADIUS_HEADER_LENGTH,
3209+
packetlength - RADIUS_HEADER_LENGTH);
32083210
memcpy(cryptvector + packetlength, secret, strlen(secret));
32093211

32103212
if (!pg_md5_binary(cryptvector,

‎src/backend/nodes/copyfuncs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
/* Copy a field that is a pointer to a C string, or perhaps NULL */
4242
#define COPY_STRING_FIELD(fldname) \
43-
(newnode->fldname = from->fldname ? pstrdup(from->fldname) : (char *) NULL)
43+
(newnode->fldname = from->fldname ? pstrdup(from->fldname) : NULL)
4444

4545
/* Copy a field that is an inline array */
4646
#define COPY_ARRAY_FIELD(fldname) \

‎src/backend/nodes/makefuncs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ makeSimpleA_Expr(A_Expr_Kind kind, char *name,
5151
A_Expr *a = makeNode(A_Expr);
5252

5353
a->kind = kind;
54-
a->name = list_make1(makeString((char *) name));
54+
a->name = list_make1(makeString(name));
5555
a->lexpr = lexpr;
5656
a->rexpr = rexpr;
5757
a->location = location;

‎src/backend/storage/page/bufpage.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1502,7 +1502,7 @@ PageSetChecksumCopy(Page page, BlockNumber blkno)
15021502

15031503
/* If we don't need a checksum, just return the passed-in data */
15041504
if (PageIsNew(page) || !DataChecksumsEnabled())
1505-
return (char *) page;
1505+
return page;
15061506

15071507
/*
15081508
* We allocate the copy space once and use it over on each subsequent

‎src/backend/utils/cache/relmapper.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ read_relmap_file(RelMapFile *map, char *dbpath, bool lock_held, int elevel)
854854

855855
/* verify the CRC */
856856
INIT_CRC32C(crc);
857-
COMP_CRC32C(crc, (char *) map, offsetof(RelMapFile, crc));
857+
COMP_CRC32C(crc, map, offsetof(RelMapFile, crc));
858858
FIN_CRC32C(crc);
859859

860860
if (!EQ_CRC32C(crc, map->crc))
@@ -910,7 +910,7 @@ write_relmap_file(RelMapFile *newmap, bool write_wal, bool send_sinval,
910910
elog(ERROR, "attempt to write bogus relation mapping");
911911

912912
INIT_CRC32C(newmap->crc);
913-
COMP_CRC32C(newmap->crc, (char *) newmap, offsetof(RelMapFile, crc));
913+
COMP_CRC32C(newmap->crc, newmap, offsetof(RelMapFile, crc));
914914
FIN_CRC32C(newmap->crc);
915915

916916
/*

‎src/backend/utils/error/jsonlog.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ write_jsonlog(ErrorData *edata)
206206
/* Error severity */
207207
if (edata->elevel)
208208
appendJSONKeyValue(&buf, "error_severity",
209-
(char *) error_severity(edata->elevel), true);
209+
error_severity(edata->elevel), true);
210210

211211
/* SQL state code */
212212
if (edata->sqlerrcode)

‎src/bin/pg_basebackup/pg_receivewal.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ FindStreamingStart(uint32 *tli)
342342
if (lseek(fd, (off_t) (-4), SEEK_END) < 0)
343343
pg_fatal("could not seek in compressed file \"%s\": %m",
344344
fullpath);
345-
r = read(fd, (char *) buf, sizeof(buf));
345+
r = read(fd, buf, sizeof(buf));
346346
if (r != sizeof(buf))
347347
{
348348
if (r < 0)

‎src/bin/pg_dump/compress_gzip.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ DeflateCompressorCommon(ArchiveHandle *AH, CompressorState *cs, bool flush)
129129
*/
130130
size_t len = gzipcs->outsize - zp->avail_out;
131131

132-
cs->writeF(AH, (char *) out, len);
132+
cs->writeF(AH, out, len);
133133
}
134134
zp->next_out = out;
135135
zp->avail_out = gzipcs->outsize;

‎src/bin/pg_rewind/pg_rewind.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ checkControlFile(ControlFileData *ControlFile)
10071007

10081008
/* Calculate CRC */
10091009
INIT_CRC32C(crc);
1010-
COMP_CRC32C(crc, (char *) ControlFile, offsetof(ControlFileData, crc));
1010+
COMP_CRC32C(crc, ControlFile, offsetof(ControlFileData, crc));
10111011
FIN_CRC32C(crc);
10121012

10131013
/* And simply compare it */

‎src/bin/psql/describe.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1741,7 +1741,7 @@ describeOneTableDetails(const char *schemaname,
17411741
*(PQgetvalue(res, 0, 13)) : 'd';
17421742
if (pset.sversion >= 120000)
17431743
tableinfo.relam = PQgetisnull(res, 0, 14) ?
1744-
(char *) NULL : pg_strdup(PQgetvalue(res, 0, 14));
1744+
NULL : pg_strdup(PQgetvalue(res, 0, 14));
17451745
else
17461746
tableinfo.relam = NULL;
17471747
PQclear(res);

‎src/common/controldata_utils.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ get_controlfile_by_exact_path(const char *ControlFilePath, bool *crc_ok_p)
135135
/* Check the CRC. */
136136
INIT_CRC32C(crc);
137137
COMP_CRC32C(crc,
138-
(char *) ControlFile,
138+
ControlFile,
139139
offsetof(ControlFileData, crc));
140140
FIN_CRC32C(crc);
141141

@@ -199,7 +199,7 @@ update_controlfile(const char *DataDir,
199199
/* Recalculate CRC of control file */
200200
INIT_CRC32C(ControlFile->crc);
201201
COMP_CRC32C(ControlFile->crc,
202-
(char *) ControlFile,
202+
ControlFile,
203203
offsetof(ControlFileData, crc));
204204
FIN_CRC32C(ControlFile->crc);
205205

‎src/interfaces/ecpg/ecpglib/descriptor.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ get_char_item(int lineno, void *var, enum ECPGttype vartype, char *value, int va
198198
case ECPGt_char:
199199
case ECPGt_unsigned_char:
200200
case ECPGt_string:
201-
strncpy((char *) var, value, varcharsize);
201+
strncpy(var, value, varcharsize);
202202
break;
203203
case ECPGt_varchar:
204204
{
@@ -597,7 +597,7 @@ set_desc_attr(struct descriptor_item *desc_item, struct variable *var,
597597
}
598598

599599
ecpg_free(desc_item->data); /* free() takes care of a potential NULL value */
600-
desc_item->data = (char *) tobeinserted;
600+
desc_item->data = tobeinserted;
601601
}
602602

603603

‎src/interfaces/ecpg/ecpglib/execute.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ ecpg_is_type_an_array(int type, const struct statement *stmt, const struct varia
278278
isarray = ECPG_ARRAY_NONE;
279279
else
280280
{
281-
isarray = (atoi((char *) PQgetvalue(query, 0, 0)) == -1) ? ECPG_ARRAY_ARRAY : ECPG_ARRAY_VECTOR;
281+
isarray = (atoi(PQgetvalue(query, 0, 0)) == -1) ? ECPG_ARRAY_ARRAY : ECPG_ARRAY_VECTOR;
282282
if (ecpg_dynamic_type(type) == SQL3_CHARACTER ||
283283
ecpg_dynamic_type(type) == SQL3_CHARACTER_VARYING)
284284
{

‎src/interfaces/ecpg/pgtypeslib/numeric.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ get_str_from_var(numeric *var, int dscale)
232232

233233
if (var->sign == NUMERIC_NAN)
234234
{
235-
str = (char *) pgtypes_alloc(4);
235+
str = pgtypes_alloc(4);
236236
if (str == NULL)
237237
return NULL;
238238
sprintf(str, "NaN");
@@ -269,7 +269,7 @@ get_str_from_var(numeric *var, int dscale)
269269
/*
270270
* Allocate space for the result
271271
*/
272-
if ((str = (char *) pgtypes_alloc(Max(0, dscale) + Max(0, var->weight) + 4)) == NULL)
272+
if ((str = pgtypes_alloc(Max(0, dscale) + Max(0, var->weight) + 4)) == NULL)
273273
return NULL;
274274
cp = str;
275275

0 commit comments

Comments
 (0)