[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - onlineupdate/source

[Michael Stahl]

 onlineupdate/source/libmar/tool/mar.c          |    1 +
 onlineupdate/source/update/updater/updater.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 01b91fdd843e1689a69544bdf8a816239f9d848e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Sep 13 20:59:21 2017 +0200

    onlineupdate: work around GCC7 -Werror=implicit-fallthrough
    
    This is pretty stupid, but oh well...
    
    Change-Id: I56a8e921d9df0276d0f607f0f59cd68d51604bc4
    Reviewed-on: https://gerrit.libreoffice.org/42256
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/onlineupdate/source/libmar/tool/mar.c b/onlineupdate/source/libmar/tool/mar.c
index dba07ac10467..bef280d325b7 100644
--- a/onlineupdate/source/libmar/tool/mar.c
+++ b/onlineupdate/source/libmar/tool/mar.c
@@ -289,6 +289,7 @@ int main(int argc, char **argv) {
     printf("\n");
     /* The fall through from 'T' to 't' is intentional */
   }
+  /* Fall through */
   case 't':
     return mar_test(argv[2]);
 
diff --git a/onlineupdate/source/update/updater/updater.cxx b/onlineupdate/source/update/updater/updater.cxx
index c8d3bb9bafa0..9b57850ec4ec 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -3530,7 +3530,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList *list)
       case FTS_DEFAULT:
         LOG(("add_dir_entries: found a non-standard file: " LOG_S,
              ftsdirEntry->fts_path));
-        // Fall through and try to remove as a file
+        /* Fall through */ // and try to remove as a file
 
       // Files
       case FTS_F: