Skip to content

Commit ed5e5f0

Browse files
peterepetere
committed
Remove unnecessary (char *) casts [xlog]
Remove (char *) casts no longer needed after XLogRegisterData() and XLogRegisterBufData() argument type change. 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 cdaeff9 commit ed5e5f0

39 files changed

+232
-232
lines changed

‎contrib/pg_visibility/pg_visibility.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ pg_truncate_visibility_map(PG_FUNCTION_ARGS)
424424
xlrec.flags = SMGR_TRUNCATE_VM;
425425

426426
XLogBeginInsert();
427-
XLogRegisterData((char *) &xlrec, sizeof(xlrec));
427+
XLogRegisterData(&xlrec, sizeof(xlrec));
428428

429429
lsn = XLogInsert(RM_SMGR_ID,
430430
XLOG_SMGR_TRUNCATE | XLR_SPECIAL_REL_UPDATE);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1135,7 +1135,7 @@ brinbuild(Relation heap, Relation index, IndexInfo *indexInfo)
11351135
xlrec.pagesPerRange = BrinGetPagesPerRange(index);
11361136

11371137
XLogBeginInsert();
1138-
XLogRegisterData((char *) &xlrec, SizeOfBrinCreateIdx);
1138+
XLogRegisterData(&xlrec, SizeOfBrinCreateIdx);
11391139
XLogRegisterBuffer(0, meta, REGBUF_WILL_INIT | REGBUF_STANDARD);
11401140

11411141
recptr = XLogInsert(RM_BRIN_ID, XLOG_BRIN_CREATE_INDEX);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,10 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange,
190190
xlrec.offnum = oldoff;
191191

192192
XLogBeginInsert();
193-
XLogRegisterData((char *) &xlrec, SizeOfBrinSamepageUpdate);
193+
XLogRegisterData(&xlrec, SizeOfBrinSamepageUpdate);
194194

195195
XLogRegisterBuffer(0, oldbuf, REGBUF_STANDARD);
196-
XLogRegisterBufData(0, (const char *) newtup, newsz);
196+
XLogRegisterBufData(0, newtup, newsz);
197197

198198
recptr = XLogInsert(RM_BRIN_ID, info);
199199

@@ -282,10 +282,10 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange,
282282
XLogBeginInsert();
283283

284284
/* new page */
285-
XLogRegisterData((char *) &xlrec, SizeOfBrinUpdate);
285+
XLogRegisterData(&xlrec, SizeOfBrinUpdate);
286286

287287
XLogRegisterBuffer(0, newbuf, REGBUF_STANDARD | (extended ? REGBUF_WILL_INIT : 0));
288-
XLogRegisterBufData(0, (const char *) newtup, newsz);
288+
XLogRegisterBufData(0, newtup, newsz);
289289

290290
/* revmap page */
291291
XLogRegisterBuffer(1, revmapbuf, 0);
@@ -435,10 +435,10 @@ brin_doinsert(Relation idxrel, BlockNumber pagesPerRange,
435435
xlrec.offnum = off;
436436

437437
XLogBeginInsert();
438-
XLogRegisterData((char *) &xlrec, SizeOfBrinInsert);
438+
XLogRegisterData(&xlrec, SizeOfBrinInsert);
439439

440440
XLogRegisterBuffer(0, *buffer, REGBUF_STANDARD | (extended ? REGBUF_WILL_INIT : 0));
441-
XLogRegisterBufData(0, (char *) tup, itemsz);
441+
XLogRegisterBufData(0, tup, itemsz);
442442

443443
XLogRegisterBuffer(1, revmapbuf, 0);
444444

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ brinRevmapDesummarizeRange(Relation idxrel, BlockNumber heapBlk)
416416
xlrec.regOffset = regOffset;
417417

418418
XLogBeginInsert();
419-
XLogRegisterData((char *) &xlrec, SizeOfBrinDesummarize);
419+
XLogRegisterData(&xlrec, SizeOfBrinDesummarize);
420420
XLogRegisterBuffer(0, revmapBuf, 0);
421421
XLogRegisterBuffer(1, regBuf, REGBUF_STANDARD);
422422
recptr = XLogInsert(RM_BRIN_ID, XLOG_BRIN_DESUMMARIZE);
@@ -627,7 +627,7 @@ revmap_physical_extend(BrinRevmap *revmap)
627627
xlrec.targetBlk = mapBlk;
628628

629629
XLogBeginInsert();
630-
XLogRegisterData((char *) &xlrec, SizeOfBrinRevmapExtend);
630+
XLogRegisterData(&xlrec, SizeOfBrinRevmapExtend);
631631
XLogRegisterBuffer(0, revmap->rm_metaBuf, REGBUF_STANDARD);
632632

633633
XLogRegisterBuffer(1, buf, REGBUF_WILL_INIT);

‎src/backend/access/gin/ginbtree.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack,
423423

424424
xlrec.flags = xlflags;
425425

426-
XLogRegisterData((char *) &xlrec, sizeof(ginxlogInsert));
426+
XLogRegisterData(&xlrec, sizeof(ginxlogInsert));
427427

428428
/*
429429
* Log information about child if this was an insertion of a
@@ -433,7 +433,7 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack,
433433
{
434434
BlockIdSet(&childblknos[0], BufferGetBlockNumber(childbuf));
435435
BlockIdSet(&childblknos[1], GinPageGetOpaque(childpage)->rightlink);
436-
XLogRegisterData((char *) childblknos,
436+
XLogRegisterData(childblknos,
437437
sizeof(BlockIdData) * 2);
438438
}
439439

@@ -617,7 +617,7 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack,
617617
if (BufferIsValid(childbuf))
618618
XLogRegisterBuffer(3, childbuf, REGBUF_STANDARD);
619619

620-
XLogRegisterData((char *) &data, sizeof(ginxlogSplit));
620+
XLogRegisterData(&data, sizeof(ginxlogSplit));
621621

622622
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_SPLIT);
623623

‎src/backend/access/gin/gindatapage.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ typedef struct
6363
* If we need WAL data representing the reconstructed leaf page, it's
6464
* stored here by computeLeafRecompressWALData.
6565
*/
66-
char *walinfo; /* buffer start */
66+
void *walinfo; /* buffer start */
6767
int walinfolen; /* and length */
6868
} disassembledLeaf;
6969

@@ -1173,7 +1173,7 @@ dataExecPlaceToPageInternal(GinBtree btree, Buffer buf, GinBtreeStack *stack,
11731173
data.newitem = *pitem;
11741174

11751175
XLogRegisterBuffer(0, buf, REGBUF_STANDARD);
1176-
XLogRegisterBufData(0, (char *) &data,
1176+
XLogRegisterBufData(0, &data,
11771177
sizeof(ginxlogInsertDataInternal));
11781178
}
11791179
}
@@ -1844,9 +1844,9 @@ createPostingTree(Relation index, ItemPointerData *items, uint32 nitems,
18441844
data.size = rootsize;
18451845

18461846
XLogBeginInsert();
1847-
XLogRegisterData((char *) &data, sizeof(ginxlogCreatePostingTree));
1847+
XLogRegisterData(&data, sizeof(ginxlogCreatePostingTree));
18481848

1849-
XLogRegisterData((char *) GinDataLeafPageGetPostingList(page),
1849+
XLogRegisterData(GinDataLeafPageGetPostingList(page),
18501850
rootsize);
18511851
XLogRegisterBuffer(0, buffer, REGBUF_WILL_INIT);
18521852

‎src/backend/access/gin/ginentrypage.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,9 +585,9 @@ entryExecPlaceToPage(GinBtree btree, Buffer buf, GinBtreeStack *stack,
585585
data.offset = off;
586586

587587
XLogRegisterBuffer(0, buf, REGBUF_STANDARD);
588-
XLogRegisterBufData(0, (char *) &data,
588+
XLogRegisterBufData(0, &data,
589589
offsetof(ginxlogInsertEntry, tuple));
590-
XLogRegisterBufData(0, (char *) insertData->entry,
590+
XLogRegisterBufData(0, insertData->entry,
591591
IndexTupleSize(insertData->entry));
592592
}
593593
}

‎src/backend/access/gin/ginfast.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ writeListPage(Relation index, Buffer buffer,
122122
data.ntuples = ntuples;
123123

124124
XLogBeginInsert();
125-
XLogRegisterData((char *) &data, sizeof(ginxlogInsertListPage));
125+
XLogRegisterData(&data, sizeof(ginxlogInsertListPage));
126126

127127
XLogRegisterBuffer(0, buffer, REGBUF_WILL_INIT);
128128
XLogRegisterBufData(0, workspace.data, size);
@@ -431,7 +431,7 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
431431
memcpy(&data.metadata, metadata, sizeof(GinMetaPageData));
432432

433433
XLogRegisterBuffer(0, metabuffer, REGBUF_WILL_INIT | REGBUF_STANDARD);
434-
XLogRegisterData((char *) &data, sizeof(ginxlogUpdateMeta));
434+
XLogRegisterData(&data, sizeof(ginxlogUpdateMeta));
435435

436436
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_UPDATE_META_PAGE);
437437
PageSetLSN(metapage, recptr);
@@ -646,7 +646,7 @@ shiftList(Relation index, Buffer metabuffer, BlockNumber newHead,
646646

647647
memcpy(&data.metadata, metadata, sizeof(GinMetaPageData));
648648

649-
XLogRegisterData((char *) &data,
649+
XLogRegisterData(&data,
650650
sizeof(ginxlogDeleteListPages));
651651

652652
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_DELETE_LISTPAGE);

‎src/backend/access/gin/ginutil.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ ginUpdateStats(Relation index, const GinStatsData *stats, bool is_build)
689689
memcpy(&data.metadata, metadata, sizeof(GinMetaPageData));
690690

691691
XLogBeginInsert();
692-
XLogRegisterData((char *) &data, sizeof(ginxlogUpdateMeta));
692+
XLogRegisterData(&data, sizeof(ginxlogUpdateMeta));
693693
XLogRegisterBuffer(0, metabuffer, REGBUF_WILL_INIT | REGBUF_STANDARD);
694694

695695
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_UPDATE_META_PAGE);

‎src/backend/access/gin/ginvacuum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ ginDeletePage(GinVacuumState *gvs, BlockNumber deleteBlkno, BlockNumber leftBlkn
216216
data.rightLink = GinPageGetOpaque(page)->rightlink;
217217
data.deleteXid = GinPageGetDeleteXid(page);
218218

219-
XLogRegisterData((char *) &data, sizeof(ginxlogDeletePage));
219+
XLogRegisterData(&data, sizeof(ginxlogDeletePage));
220220

221221
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_DELETE_PAGE);
222222
PageSetLSN(page, recptr);

‎src/backend/access/gist/gistxlog.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -528,14 +528,14 @@ gistXLogSplit(bool page_is_leaf,
528528
* of buffer or data registrations here, make sure you modify the
529529
* XLogEnsureRecordSpace() calls accordingly!
530530
*/
531-
XLogRegisterData((char *) &xlrec, sizeof(gistxlogPageSplit));
531+
XLogRegisterData(&xlrec, sizeof(gistxlogPageSplit));
532532

533533
i = 1;
534534
for (ptr = dist; ptr; ptr = ptr->next)
535535
{
536536
XLogRegisterBuffer(i, ptr->buffer, REGBUF_WILL_INIT);
537-
XLogRegisterBufData(i, (char *) &(ptr->block.num), sizeof(int));
538-
XLogRegisterBufData(i, (char *) ptr->list, ptr->lenlist);
537+
XLogRegisterBufData(i, &(ptr->block.num), sizeof(int));
538+
XLogRegisterBufData(i, ptr->list, ptr->lenlist);
539539
i++;
540540
}
541541

@@ -559,7 +559,7 @@ gistXLogPageDelete(Buffer buffer, FullTransactionId xid,
559559
xlrec.downlinkOffset = downlinkOffset;
560560

561561
XLogBeginInsert();
562-
XLogRegisterData((char *) &xlrec, SizeOfGistxlogPageDelete);
562+
XLogRegisterData(&xlrec, SizeOfGistxlogPageDelete);
563563

564564
XLogRegisterBuffer(0, buffer, REGBUF_STANDARD);
565565
XLogRegisterBuffer(1, parentBuffer, REGBUF_STANDARD);
@@ -583,7 +583,7 @@ gistXLogAssignLSN(void)
583583
*/
584584
XLogBeginInsert();
585585
XLogSetRecordFlags(XLOG_MARK_UNIMPORTANT);
586-
XLogRegisterData((char *) &dummy, sizeof(dummy));
586+
XLogRegisterData(&dummy, sizeof(dummy));
587587
return XLogInsert(RM_GIST_ID, XLOG_GIST_ASSIGN_LSN);
588588
}
589589

@@ -609,7 +609,7 @@ gistXLogPageReuse(Relation rel, Relation heaprel,
609609
xlrec_reuse.snapshotConflictHorizon = deleteXid;
610610

611611
XLogBeginInsert();
612-
XLogRegisterData((char *) &xlrec_reuse, SizeOfGistxlogPageReuse);
612+
XLogRegisterData(&xlrec_reuse, SizeOfGistxlogPageReuse);
613613

614614
XLogInsert(RM_GIST_ID, XLOG_GIST_PAGE_REUSE);
615615
}
@@ -639,14 +639,14 @@ gistXLogUpdate(Buffer buffer,
639639
xlrec.ntoinsert = ituplen;
640640

641641
XLogBeginInsert();
642-
XLogRegisterData((char *) &xlrec, sizeof(gistxlogPageUpdate));
642+
XLogRegisterData(&xlrec, sizeof(gistxlogPageUpdate));
643643

644644
XLogRegisterBuffer(0, buffer, REGBUF_STANDARD);
645-
XLogRegisterBufData(0, (char *) todelete, sizeof(OffsetNumber) * ntodelete);
645+
XLogRegisterBufData(0, todelete, sizeof(OffsetNumber) * ntodelete);
646646

647647
/* new tuples */
648648
for (i = 0; i < ituplen; i++)
649-
XLogRegisterBufData(0, (char *) (itup[i]), IndexTupleSize(itup[i]));
649+
XLogRegisterBufData(0, itup[i], IndexTupleSize(itup[i]));
650650

651651
/*
652652
* Include a full page image of the child buf. (only necessary if a
@@ -678,14 +678,14 @@ gistXLogDelete(Buffer buffer, OffsetNumber *todelete, int ntodelete,
678678
xlrec.ntodelete = ntodelete;
679679

680680
XLogBeginInsert();
681-
XLogRegisterData((char *) &xlrec, SizeOfGistxlogDelete);
681+
XLogRegisterData(&xlrec, SizeOfGistxlogDelete);
682682

683683
/*
684684
* We need the target-offsets array whether or not we store the whole
685685
* buffer, to allow us to find the snapshotConflictHorizon on a standby
686686
* server.
687687
*/
688-
XLogRegisterData((char *) todelete, ntodelete * sizeof(OffsetNumber));
688+
XLogRegisterData(todelete, ntodelete * sizeof(OffsetNumber));
689689

690690
XLogRegisterBuffer(0, buffer, REGBUF_STANDARD);
691691

‎src/backend/access/hash/hash.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ hashbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
616616
xlrec.ntuples = metap->hashm_ntuples;
617617

618618
XLogBeginInsert();
619-
XLogRegisterData((char *) &xlrec, SizeOfHashUpdateMetaPage);
619+
XLogRegisterData(&xlrec, SizeOfHashUpdateMetaPage);
620620

621621
XLogRegisterBuffer(0, metabuf, REGBUF_STANDARD);
622622

@@ -823,7 +823,7 @@ hashbucketcleanup(Relation rel, Bucket cur_bucket, Buffer bucket_buf,
823823
xlrec.is_primary_bucket_page = (buf == bucket_buf);
824824

825825
XLogBeginInsert();
826-
XLogRegisterData((char *) &xlrec, SizeOfHashDelete);
826+
XLogRegisterData(&xlrec, SizeOfHashDelete);
827827

828828
/*
829829
* bucket buffer was not changed, but still needs to be
@@ -838,7 +838,7 @@ hashbucketcleanup(Relation rel, Bucket cur_bucket, Buffer bucket_buf,
838838
}
839839

840840
XLogRegisterBuffer(1, buf, REGBUF_STANDARD);
841-
XLogRegisterBufData(1, (char *) deletable,
841+
XLogRegisterBufData(1, deletable,
842842
ndeletable * sizeof(OffsetNumber));
843843

844844
recptr = XLogInsert(RM_HASH_ID, XLOG_HASH_DELETE);

‎src/backend/access/hash/hashinsert.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,12 @@ _hash_doinsert(Relation rel, IndexTuple itup, Relation heapRel, bool sorted)
221221
xlrec.offnum = itup_off;
222222

223223
XLogBeginInsert();
224-
XLogRegisterData((char *) &xlrec, SizeOfHashInsert);
224+
XLogRegisterData(&xlrec, SizeOfHashInsert);
225225

226226
XLogRegisterBuffer(1, metabuf, REGBUF_STANDARD);
227227

228228
XLogRegisterBuffer(0, buf, REGBUF_STANDARD);
229-
XLogRegisterBufData(0, (char *) itup, IndexTupleSize(itup));
229+
XLogRegisterBufData(0, itup, IndexTupleSize(itup));
230230

231231
recptr = XLogInsert(RM_HASH_ID, XLOG_HASH_INSERT);
232232

@@ -436,14 +436,14 @@ _hash_vacuum_one_page(Relation rel, Relation hrel, Buffer metabuf, Buffer buf)
436436

437437
XLogBeginInsert();
438438
XLogRegisterBuffer(0, buf, REGBUF_STANDARD);
439-
XLogRegisterData((char *) &xlrec, SizeOfHashVacuumOnePage);
439+
XLogRegisterData(&xlrec, SizeOfHashVacuumOnePage);
440440

441441
/*
442442
* We need the target-offsets array whether or not we store the
443443
* whole buffer, to allow us to find the snapshotConflictHorizon
444444
* on a standby server.
445445
*/
446-
XLogRegisterData((char *) deletable,
446+
XLogRegisterData(deletable,
447447
ndeletable * sizeof(OffsetNumber));
448448

449449
XLogRegisterBuffer(1, metabuf, REGBUF_STANDARD);

0 commit comments

Comments
 (0)