From 537d0e78fa6f704b5536fe3d573a9ee6487e64a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Thu, 23 Oct 2014 13:50:25 +0200
Subject: [PATCH] 2014-10-23 13:50 UTC+0200 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * src/rdd/dbfcdx/dbfcdx1.c     ; minor comment
 update

  * utils/hbmk2/hbmk2.prg
    ! fixed error/waring messages after recent modifications for -stop
      switch
---
 ChangeLog.txt            |  8 ++++++++
 src/rdd/dbfcdx/dbfcdx1.c |  4 +++-
 utils/hbmk2/hbmk2.prg    | 26 ++++++++++++--------------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5fc3bc63fe..174a678801 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,14 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2014-10-23 13:50 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/rdd/dbfcdx/dbfcdx1.c
+    ; minor comment update
+
+  * utils/hbmk2/hbmk2.prg
+    ! fixed error/waring messages after recent modifications for -stop
+      switch
+
 2014-10-23 13:20 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/rddads/ads1.c
   * contrib/rddads/adsfunc.c
diff --git a/src/rdd/dbfcdx/dbfcdx1.c b/src/rdd/dbfcdx/dbfcdx1.c
index d996054611..2c476545b0 100644
--- a/src/rdd/dbfcdx/dbfcdx1.c
+++ b/src/rdd/dbfcdx/dbfcdx1.c
@@ -3434,7 +3434,9 @@ static HB_BOOL hb_cdxSetPageSize( LPCDXINDEX pIndex, HB_BOOL fLargeFile,
       {
          while( ( HB_INT ) ( 1 << pIndex->uiPageBits ) < uiPageSize )
             ++pIndex->uiPageBits;
-#if 0 /* it needs new leaf node structure with more then byte */
+#if 0
+      /* it needs new leaf node structure with more then byte
+         for dup and trail bits */
          pIndex->uiMaxKeyLen = ( ( uiPageSize - CDX_INT_HEADSIZE ) >> 1 ) - 8;
 #else
          pIndex->uiMaxKeyLen = 255;
diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg
index 674c6fa869..e4ee1ae833 100644
--- a/utils/hbmk2/hbmk2.prg
+++ b/utils/hbmk2/hbmk2.prg
@@ -812,25 +812,23 @@ STATIC PROCEDURE hbmk_local_entry( ... )
       nResult := __hbmk( aArgsTarget, nTargetPos, 1, @lPause, @lExitStr )
 
       /* Exit on first failure */
-      IF nResult != _EXIT_OK .AND. ;
-         nResult != _EXIT_STOP
-         EXIT
+      IF nResult != _EXIT_OK
+         IF lExitStr
+            OutErr( hb_StrFormat( _SELF_NAME_ + iif( ! Empty( cTargetName ), "[" + cTargetName + "]", "" ) + ;
+                                  ": " + I_( "Exit code: %1$d: %2$s" ), nResult, ExitCodeStr( nResult ) ) + _OUT_EOL )
+         ENDIF
+         IF nResult != _EXIT_STOP
+            IF lPause
+               OutStd( I_( "Press any key to continue..." ) )
+               Inkey( 0 )
+            ENDIF
+            EXIT
+         ENDIF
       ENDIF
 
       ++nTargetTO_DO
    ENDDO
 
-   IF nResult != _EXIT_OK
-      IF lExitStr
-         OutErr( hb_StrFormat( _SELF_NAME_ + iif( ! Empty( cTargetName ), "[" + cTargetName + "]", "" ) + ;
-                               ": " + I_( "Exit code: %1$d: %2$s" ), nResult, ExitCodeStr( nResult ) ) + _OUT_EOL )
-      ENDIF
-      IF lPause
-         OutStd( I_( "Press any key to continue..." ) )
-         Inkey( 0 )
-      ENDIF
-   ENDIF
-
    ErrorLevel( nResult )
 
    RETURN