NotificationsYou must be signed in to change notification settings
Fork5k
Star17.9k

Commit8134fe4

committed

Remove some pointless code in block.h.

There's no visible point in casting the result of a comparison tobool, because it already is that, at least on C99 compilers.I see no point in these assertions that a pointer we're about todereference isn't null, either. If it is, the resulting SIGSEGVwill notify us of the problem just fine.Noted while reviewing Zhihong Yu's patch. This is basicallycosmetic, so no need for back-patch.Discussion:https://postgr.es/m/CALNJ-vT9r0DSsAOw9OXVJFxLENoVS_68kJ5x0p44atoYH+H4dg@mail.gmail.com

1 parent0fbdfaf commit8134fe4Copy full SHA for 8134fe4

File tree

1 file changed

-9

lines changed

src/include/storage
- block.h

1 file changed

-9

lines changed

`‎src/include/storage/block.h`

Lines changed: 3 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,22 +68,21 @@ typedef BlockIdData BlockId;/ block identifier */`
`68`	`68`	`*True iff blockNumber is valid.`
`69`	`69`	`*/`
`70`	`70`	`#defineBlockNumberIsValid(blockNumber) \`
`71`		`-((bool) ((BlockNumber) (blockNumber) != InvalidBlockNumber))`
	`71`	`+((BlockNumber) (blockNumber) != InvalidBlockNumber)`
`72`	`72`
`73`	`73`	`/*`
`74`	`74`	`* BlockIdIsValid`
`75`	`75`	`*True iff the block identifier is valid.`
`76`	`76`	`*/`
`77`	`77`	`#defineBlockIdIsValid(blockId) \`
`78`		`-((bool)PointerIsValid(blockId))`
	`78`	`+PointerIsValid(blockId)`
`79`	`79`
`80`	`80`	`/*`
`81`	`81`	`* BlockIdSet`
`82`	`82`	`*Sets a block identifier to the specified value.`
`83`	`83`	`*/`
`84`	`84`	`#defineBlockIdSet(blockId,blockNumber) \`
`85`	`85`	`( \`
`86`		`-AssertMacro(PointerIsValid(blockId)), \`
`87`	`86`	`(blockId)->bi_hi = (blockNumber) >> 16, \`
`88`	`87`	`(blockId)->bi_lo = (blockNumber) & 0xffff \`
`89`	`88`	`)`
`@@ -94,8 +93,6 @@ typedef BlockIdData BlockId;/ block identifier */`
`94`	`93`	`*/`
`95`	`94`	`#defineBlockIdCopy(toBlockId,fromBlockId) \`
`96`	`95`	`( \`
`97`		`-AssertMacro(PointerIsValid(toBlockId)), \`
`98`		`-AssertMacro(PointerIsValid(fromBlockId)), \`
`99`	`96`	`(toBlockId)->bi_hi = (fromBlockId)->bi_hi, \`
`100`	`97`	`(toBlockId)->bi_lo = (fromBlockId)->bi_lo \`
`101`	`98`	`)`
`@@ -113,9 +110,6 @@ typedef BlockIdData BlockId;/ block identifier */`
`113`	`110`	`*Retrieve the block number from a block identifier.`
`114`	`111`	`*/`
`115`	`112`	`#defineBlockIdGetBlockNumber(blockId) \`
`116`		`-( \`
`117`		`-AssertMacro(BlockIdIsValid(blockId)), \`
`118`		`-((((BlockNumber) (blockId)->bi_hi) << 16) \| ((BlockNumber) (blockId)->bi_lo)) \`
`119`		`-)`
	`113`	`+((((BlockNumber) (blockId)->bi_hi) << 16) \| ((BlockNumber) (blockId)->bi_lo))`
`120`	`114`
`121`	`115`	`#endif/* BLOCK_H */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8134fe4

File tree

1 file changed

1 file changed

`‎src/include/storage/block.h`

0 commit comments