2025-01-19 14:33 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

* src/rdd/dbfcdx/dbfcdx1.c
    % Removed always false dummy condition. For
         pPage->TagParent->MaxKeys >= 2 &&
         ( ( iKeys + pPage->TagParent->MaxKeys - 1 )
                   / pPage->TagParent->MaxKeys ) == 1
      the expression
         iKeys > ( ( pPage->TagParent->MaxKeys * 3 ) >> 1 )
      was alwas false.
      As side effect this modification pacifies the buggy GCC warnings.
This commit is contained in:
Przemysław Czerpak
2025-01-19 14:33:34 +01:00
parent a40aa4baf0
commit 8ef93ac2a1
2 changed files with 11 additions and 9 deletions

View File

@@ -7,6 +7,17 @@
Entries may not always be in chronological/commit order.
See license at the end of file. */
2025-01-19 14:33 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rdd/dbfcdx/dbfcdx1.c
% Removed always false dummy condition. For
pPage->TagParent->MaxKeys >= 2 &&
( ( iKeys + pPage->TagParent->MaxKeys - 1 )
/ pPage->TagParent->MaxKeys ) == 1
the expression
iKeys > ( ( pPage->TagParent->MaxKeys * 3 ) >> 1 )
was alwas false.
As side effect this modification pacifies the buggy GCC warnings.
2025-01-19 02:08 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/hbssl/hbssl.h
* contrib/hbssl/rsa.c

View File

@@ -3068,15 +3068,6 @@ static int hb_cdxPageKeyIntBalance( LPCDXPAGE pPage, int iChildRet )
}
iNeedKeys = ( iKeys + pPage->TagParent->MaxKeys - 1 )
/ pPage->TagParent->MaxKeys;
#if 1
if( iNeedKeys == 1 && iBlncKeys > 1 && childs[ 0 ]->Left != CDX_DUMMYNODE &&
childs[ iBlncKeys - 1 ]->Right != CDX_DUMMYNODE &&
iKeys >= ( CDX_BALANCE_INTPAGES << 1 ) &&
iKeys > ( ( pPage->TagParent->MaxKeys * 3 ) >> 1 ) )
{
iNeedKeys = 2;
}
#endif
#if 1
iDiv = HB_MAX( iMax - iMin - ( pPage->TagParent->MaxKeys >> 1 ) + 1,
iBlncKeys - iNeedKeys );