From fb76fb49cd6e9816a6c3c9658e24bf8fdf610aba Mon Sep 17 00:00:00 2001 From: Bharath Rupireddy Date: Sat, 20 Nov 2021 14:11:01 +0000 Subject: [PATCH v1] rename SnapBuild* macros in slot.c Same macro names for SnapBuildOnDiskNotChecksummedSize and SnapBuildOnDiskChecksummedSize are being used in slot.c and snapbuild.c. This patch renames them, in slot.c, to ReplicationSlotOnDiskNotChecksummedSize and ReplicationSlotOnDiskChecksummedSize similar to the other macros. --- src/backend/replication/slot.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c index e4f5c6fb36..90ba9b417d 100644 --- a/src/backend/replication/slot.c +++ b/src/backend/replication/slot.c @@ -77,11 +77,11 @@ typedef struct ReplicationSlotOnDisk #define ReplicationSlotOnDiskConstantSize \ offsetof(ReplicationSlotOnDisk, slotdata) /* size of the part of the slot not covered by the checksum */ -#define SnapBuildOnDiskNotChecksummedSize \ +#define ReplicationSlotOnDiskNotChecksummedSize \ offsetof(ReplicationSlotOnDisk, version) /* size of the part covered by the checksum */ -#define SnapBuildOnDiskChecksummedSize \ - sizeof(ReplicationSlotOnDisk) - SnapBuildOnDiskNotChecksummedSize +#define ReplicationSlotOnDiskChecksummedSize \ + sizeof(ReplicationSlotOnDisk) - ReplicationSlotOnDiskNotChecksummedSize /* size of the slot data that is version dependent */ #define ReplicationSlotOnDiskV2Size \ sizeof(ReplicationSlotOnDisk) - ReplicationSlotOnDiskConstantSize @@ -1571,8 +1571,8 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel) SpinLockRelease(&slot->mutex); COMP_CRC32C(cp.checksum, - (char *) (&cp) + SnapBuildOnDiskNotChecksummedSize, - SnapBuildOnDiskChecksummedSize); + (char *) (&cp) + ReplicationSlotOnDiskNotChecksummedSize, + ReplicationSlotOnDiskChecksummedSize); FIN_CRC32C(cp.checksum); errno = 0; @@ -1787,8 +1787,8 @@ RestoreSlotFromDisk(const char *name) /* now verify the CRC */ INIT_CRC32C(checksum); COMP_CRC32C(checksum, - (char *) &cp + SnapBuildOnDiskNotChecksummedSize, - SnapBuildOnDiskChecksummedSize); + (char *) &cp + ReplicationSlotOnDiskNotChecksummedSize, + ReplicationSlotOnDiskChecksummedSize); FIN_CRC32C(checksum); if (!EQ_CRC32C(checksum, cp.checksum)) -- 2.25.1