Fix one overflow and one signedness error, caused by the patch to calculate

OLDSERXID_MAX_PAGE based on BLCKSZ. MSVC compiler warned about these.
This commit is contained in:
Heikki Linnakangas 2011-07-08 17:28:27 +03:00
parent 7544064b15
commit 9598afa3b0
1 changed files with 2 additions and 2 deletions

View File

@ -311,7 +311,7 @@ static SlruCtlData OldSerXidSlruCtlData;
* transactions and the maximum that SLRU supports.
*/
#define OLDSERXID_MAX_PAGE Min(SLRU_PAGES_PER_SEGMENT * 0x10000 - 1, \
(MaxTransactionId + 1) / OLDSERXID_ENTRIESPERPAGE - 1)
(MaxTransactionId) / OLDSERXID_ENTRIESPERPAGE)
#define OldSerXidNextPage(page) (((page) >= OLDSERXID_MAX_PAGE) ? 0 : (page) + 1)
@ -767,7 +767,7 @@ OldSerXidPagePrecedesLogically(int p, int q)
diff = p - q;
if (diff >= ((OLDSERXID_MAX_PAGE + 1) / 2))
diff -= OLDSERXID_MAX_PAGE + 1;
else if (diff < -((OLDSERXID_MAX_PAGE + 1) / 2))
else if (diff < -((int) (OLDSERXID_MAX_PAGE + 1) / 2))
diff += OLDSERXID_MAX_PAGE + 1;
return diff < 0;
}