rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove some pointless code in block.h. 

There's no visible point in casting the result of a comparison to
bool, because it already is that, at least on C99 compilers.

I see no point in these assertions that a pointer we're about to
dereference isn't null, either.  If it is, the resulting SIGSEGV
will notify us of the problem just fine.

Noted while reviewing Zhihong Yu's patch.  This is basically
cosmetic, so no need for back-patch.

Discussion: https://postgr.es/m/CALNJ-vT9r0DSsAOw9OXVJFxLENoVS_68kJ5x0p44atoYH+H4dg@mail.gmail.com
This commit is contained in:
Tom Lane 2022-03-03 19:15:38 -05:00
parent 0fbdfaf79d
commit 8134fe4ad8
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/include/storage/block.h
View File

@ -68,14 +68,14 @@ typedef BlockIdData *BlockId; /* block identifier */
* True iff blockNumber is valid. * True iff blockNumber is valid.
*/ */
#define BlockNumberIsValid(blockNumber) \ #define BlockNumberIsValid(blockNumber) \
((bool) ((BlockNumber) (blockNumber) != InvalidBlockNumber)) ((BlockNumber) (blockNumber) != InvalidBlockNumber)
/* /*
* BlockIdIsValid * BlockIdIsValid
* True iff the block identifier is valid. * True iff the block identifier is valid.
*/ */
#define BlockIdIsValid(blockId) \ #define BlockIdIsValid(blockId) \
((bool) PointerIsValid(blockId)) PointerIsValid(blockId)
/* /*
* BlockIdSet * BlockIdSet
@ -83,7 +83,6 @@ typedef BlockIdData *BlockId; /* block identifier */
*/ */
#define BlockIdSet(blockId, blockNumber) \ #define BlockIdSet(blockId, blockNumber) \
( \ ( \
AssertMacro(PointerIsValid(blockId)), \
(blockId)->bi_hi = (blockNumber) >> 16, \ (blockId)->bi_hi = (blockNumber) >> 16, \
(blockId)->bi_lo = (blockNumber) & 0xffff \ (blockId)->bi_lo = (blockNumber) & 0xffff \
) )
@ -94,8 +93,6 @@ typedef BlockIdData *BlockId; /* block identifier */
*/ */
#define BlockIdCopy(toBlockId, fromBlockId) \ #define BlockIdCopy(toBlockId, fromBlockId) \
( \ ( \
AssertMacro(PointerIsValid(toBlockId)), \
AssertMacro(PointerIsValid(fromBlockId)), \
(toBlockId)->bi_hi = (fromBlockId)->bi_hi, \ (toBlockId)->bi_hi = (fromBlockId)->bi_hi, \
(toBlockId)->bi_lo = (fromBlockId)->bi_lo \ (toBlockId)->bi_lo = (fromBlockId)->bi_lo \
) )
@ -113,9 +110,6 @@ typedef BlockIdData *BlockId; /* block identifier */
* Retrieve the block number from a block identifier. * Retrieve the block number from a block identifier.
*/ */
#define BlockIdGetBlockNumber(blockId) \ #define BlockIdGetBlockNumber(blockId) \
( \ ((((BlockNumber) (blockId)->bi_hi) << 16) | ((BlockNumber) (blockId)->bi_lo))
AssertMacro(BlockIdIsValid(blockId)), \
((((BlockNumber) (blockId)->bi_hi) << 16) | ((BlockNumber) (blockId)->bi_lo)) \
)
#endif /* BLOCK_H */ #endif /* BLOCK_H */