Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitebdccea

Browse files
committed
SnapBuildRestoreContents() void * argument for binary data
Change internal snapbuild API function to take void * for binary datainstead of char *. This removes the need for numerous casts.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 parenta4e986e commitebdccea

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

‎src/backend/replication/logical/snapbuild.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ static void SnapBuildWaitSnapshot(xl_running_xacts *running, TransactionId cutof
173173
/* serialization functions */
174174
staticvoidSnapBuildSerialize(SnapBuild*builder,XLogRecPtrlsn);
175175
staticboolSnapBuildRestore(SnapBuild*builder,XLogRecPtrlsn);
176-
staticvoidSnapBuildRestoreContents(intfd,char*dest,Sizesize,constchar*path);
176+
staticvoidSnapBuildRestoreContents(intfd,void*dest,Sizesize,constchar*path);
177177

178178
/*
179179
* Allocate a new snapshot builder.
@@ -1722,7 +1722,7 @@ SnapBuildRestoreSnapshot(SnapBuildOnDisk *ondisk, const char *path,
17221722
fsync_fname(PG_LOGICAL_SNAPSHOTS_DIR, true);
17231723

17241724
/* read statically sized portion of snapshot */
1725-
SnapBuildRestoreContents(fd,(char*)ondisk,SnapBuildOnDiskConstantSize,path);
1725+
SnapBuildRestoreContents(fd,ondisk,SnapBuildOnDiskConstantSize,path);
17261726

17271727
if (ondisk->magic!=SNAPBUILD_MAGIC)
17281728
ereport(ERROR,
@@ -1742,15 +1742,15 @@ SnapBuildRestoreSnapshot(SnapBuildOnDisk *ondisk, const char *path,
17421742
SnapBuildOnDiskConstantSize-SnapBuildOnDiskNotChecksummedSize);
17431743

17441744
/* read SnapBuild */
1745-
SnapBuildRestoreContents(fd,(char*)&ondisk->builder,sizeof(SnapBuild),path);
1745+
SnapBuildRestoreContents(fd,&ondisk->builder,sizeof(SnapBuild),path);
17461746
COMP_CRC32C(checksum,&ondisk->builder,sizeof(SnapBuild));
17471747

17481748
/* restore committed xacts information */
17491749
if (ondisk->builder.committed.xcnt>0)
17501750
{
17511751
sz=sizeof(TransactionId)*ondisk->builder.committed.xcnt;
17521752
ondisk->builder.committed.xip=MemoryContextAllocZero(context,sz);
1753-
SnapBuildRestoreContents(fd,(char*)ondisk->builder.committed.xip,sz,path);
1753+
SnapBuildRestoreContents(fd,ondisk->builder.committed.xip,sz,path);
17541754
COMP_CRC32C(checksum,ondisk->builder.committed.xip,sz);
17551755
}
17561756

@@ -1759,7 +1759,7 @@ SnapBuildRestoreSnapshot(SnapBuildOnDisk *ondisk, const char *path,
17591759
{
17601760
sz=sizeof(TransactionId)*ondisk->builder.catchange.xcnt;
17611761
ondisk->builder.catchange.xip=MemoryContextAllocZero(context,sz);
1762-
SnapBuildRestoreContents(fd,(char*)ondisk->builder.catchange.xip,sz,path);
1762+
SnapBuildRestoreContents(fd,ondisk->builder.catchange.xip,sz,path);
17631763
COMP_CRC32C(checksum,ondisk->builder.catchange.xip,sz);
17641764
}
17651765

@@ -1882,7 +1882,7 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn)
18821882
* Read the contents of the serialized snapshot to 'dest'.
18831883
*/
18841884
staticvoid
1885-
SnapBuildRestoreContents(intfd,char*dest,Sizesize,constchar*path)
1885+
SnapBuildRestoreContents(intfd,void*dest,Sizesize,constchar*path)
18861886
{
18871887
intreadBytes;
18881888

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp