From 3e3d5b17760eac5d6be9f8e47972bae58ceba8eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Tue, 9 May 2017 10:57:43 +0200
Subject: [PATCH] 2017-05-09 10:57 UTC+0200 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * contrib/rddads/ads1.c   * src/rdd/workarea.c  
   * simplified the code and eliminated wrong /* fallthrough */ comments      
 inside case block reported by Viktor

---
 ChangeLog.txt         |  6 ++++++
 contrib/rddads/ads1.c |  6 +-----
 src/rdd/workarea.c    | 15 ++-------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 84948cf7f1..003ab41065 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,12 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2017-05-09 10:57 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * contrib/rddads/ads1.c
+  * src/rdd/workarea.c
+    * simplified the code and eliminated wrong /* fallthrough */ comments
+      inside case block reported by Viktor
+
 2017-05-09 09:14 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/hbwin/olecore.c
     + added support for named parameters in OLE method calls,
diff --git a/contrib/rddads/ads1.c b/contrib/rddads/ads1.c
index c41e396e3c..78a30af6ab 100644
--- a/contrib/rddads/ads1.c
+++ b/contrib/rddads/ads1.c
@@ -2081,16 +2081,12 @@ static HB_ERRCODE adsFieldInfo( ADSAREAP pArea, HB_USHORT uiIndex, HB_USHORT uiT
       }
 #if ADS_LIB_VERSION >= 710
       case DBS_TYPE:
-      {
-         LPFIELD pField = pArea->area.lpFields + uiIndex - 1;
-
-         if( pField->uiTypeExtended == ADS_CISTRING )
+         if( pArea->area.lpFields[ uiIndex - 1 ].uiTypeExtended == ADS_CISTRING )
          {
             hb_itemPutC( pItem, "CICHARACTER" );
             break;
          }
          /* fallthrough */
-      }
 #endif
       default:
          return SUPER_FIELDINFO( &pArea->area, uiIndex, uiType, pItem );
diff --git a/src/rdd/workarea.c b/src/rdd/workarea.c
index 56fd2682df..13e566c5d0 100644
--- a/src/rdd/workarea.c
+++ b/src/rdd/workarea.c
@@ -1926,20 +1926,9 @@ static HB_ERRCODE hb_waRddInfo( LPRDDNODE pRDD, HB_USHORT uiIndex, HB_ULONG ulCo
          const char * szExt = hb_setGetMFileExt();
          char * szResult = szExt ? hb_strdup( szExt ) : NULL;
          if( hb_itemType( pItem ) & HB_IT_STRING )
-         {
             hb_setSetItem( HB_SET_MFILEEXT, pItem );
-            if( szResult )
-               hb_itemPutCLPtr( pItem, szResult, strlen( szResult ) );
-            else
-               hb_itemPutC( pItem, NULL );
-            break;
-         }
-         else if( szResult )
-         {
-            hb_itemPutCLPtr( pItem, szResult, strlen( szResult ) );
-            break;
-         }
-         /* fallthrough */ /*return HB_FAILURE */
+         hb_itemPutCPtr( pItem, szResult );
+         break;
       }
       case RDDI_TABLEEXT:
       case RDDI_ORDBAGEXT: