2017-09-08 16:00 UTC Viktor Szakats (vszakats users.noreply.github.com)

* *
    * partial sync with the 3.4 fork codebase. These are the things
      synces for the most part:
      - copyright headers
      - grammar/typos in comments and some readmes
      - comment/whitespace/decorations
      - variable scoping in C files
      - DO CASE/SWITCH and some other alternate syntax usage
      - minimal amount of human readable text in strings
      - minor code updates
      - HB_TRACE() void * casts for pointers and few other changes to
        avoid C compiler warnings
      - various other, minor code cleanups
      - only Harbour/C code/headers were touched in src, utils, contrib,
        include. No 3rd party code, no make files, and with just a few
        exceptions, no 'tests' code was touched.
      - certain components were not touched were 3.4 diverged too much
        already, like f.e. hbmk2, hbssl, hbcurl, hbexpat
      - the goal was that no actual program logic should be altered by
        these changes. Except some possible minor exceptions, any such
        change is probably a bug in this patch.
      It's a massive patch, if you find anything broken after it, please
      open an Issue with the details. Build test was done on macOS.
      The goal is make it easier to see what actual code/logic was changed
      in 3.4 compared to 3.2 and to make patches easier to apply in both
      ways.

contrib/rddsql/sqlbase.c

@@ -104,11 +104,11 @@ void hb_rddsqlSetError( HB_ERRCODE errCode, const char * szError, const char * s
 
 static HB_ERRCODE hb_errRT_SQLBASE( HB_ERRCODE errGenCode, HB_ERRCODE errSubCode, const char * szDescription, const char * szOperation )
 {
-   PHB_ITEM   pError;
    HB_ERRCODE iRet = HB_FAILURE;
 
    if( hb_vmRequestQuery() == 0 )
    {
+      PHB_ITEM pError;
       pError = hb_errRT_New( ES_ERROR, "SQLBASE", errGenCode, errSubCode, szDescription, szOperation, 0, EF_NONE );
       iRet   = hb_errLaunch( pError );
       hb_itemRelease( pError );
@@ -117,7 +117,7 @@ static HB_ERRCODE hb_errRT_SQLBASE( HB_ERRCODE errGenCode, HB_ERRCODE errSubCode
 }
 
 
-/*================ NULL SDD ==========================================================*/
+/* --- NULL SDD --- */
 
 static HB_ERRCODE sddConnect( SQLDDCONNECTION * pConnection, PHB_ITEM pItem );
 static HB_ERRCODE sddDisconnect( SQLDDCONNECTION * pConnection );
@@ -224,7 +224,7 @@ static HB_ERRCODE sddGetVarLen( SQLBASEAREAP pArea, HB_USHORT uiIndex, HB_ULONG
 }
 
 
-/*==================== SDD registration =====================================*/
+/* --- SDD registration --- */
 
 static PSDDNODE s_pSdd = NULL;
 
@@ -263,7 +263,7 @@ int hb_sddRegister( PSDDNODE pSdd )
 }
 
 
-/*============= RDD METHODS =============================================================*/
+/* --- RDD METHODS --- */
 
 static HB_ERRCODE sqlbaseGoBottom( SQLBASEAREAP pArea )
 {
@@ -310,13 +310,11 @@ static HB_ERRCODE sqlbaseGoTo( SQLBASEAREAP pArea, HB_ULONG ulRecNo )
 
 static HB_ERRCODE sqlbaseGoToId( SQLBASEAREAP pArea, PHB_ITEM pItem )
 {
-   PHB_ITEM pError;
-
    if( HB_IS_NUMERIC( pItem ) )
       return SELF_GOTO( &pArea->area, hb_itemGetNL( pItem ) );
    else
    {
-      pError = hb_errNew();
+      PHB_ITEM pError = hb_errNew();
       hb_errPutGenCode( pError, EG_DATATYPE );
       hb_errPutDescription( pError, hb_langDGetErrorDesc( EG_DATATYPE ) );
       hb_errPutSubCode( pError, EDBF_DATATYPE );
@@ -900,12 +898,12 @@ static HB_ERRCODE sqlbaseInit( LPRDDNODE pRDD )
 
 static HB_ERRCODE sqlbaseExit( LPRDDNODE pRDD )
 {
-   HB_ULONG ul;
-
    HB_SYMBOL_UNUSED( pRDD );
 
    if( s_pConnection )
    {
+      HB_ULONG ul;
+
       /* Disconnect all connections */
       for( ul = 0; ul < s_ulConnectionCount; ul++ )
       {
@@ -1089,7 +1087,7 @@ static HB_ERRCODE sqlbaseRddInfo( LPRDDNODE pRDD, HB_USHORT uiIndex, HB_ULONG ul
 }
 
 
-/*====================================================================================*/
+/* --- */
 
 static RDDFUNCS sqlbaseTable =
 {
@@ -1196,7 +1194,7 @@ static RDDFUNCS sqlbaseTable =
 };
 
 
-/*================ Module initialization code ========================================*/
+/* --- Module initialization code --- */
 
 HB_FUNC( SQLBASE )
 {