[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - soltools/cpp

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Fri Apr 5 14:52:46 UTC 2019


 soltools/cpp/_eval.c |    2 +-
 soltools/cpp/_lex.c  |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1f9ad97953ff31363f12f2d94bdc2d0d0693e3d2
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jan 26 14:55:14 2017 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Apr 5 14:31:18 2019 +0200

    -Werror=implicit-fallthrough= (GCC 7)
    
    Change-Id: I2e9ab956fc1e59d09b7409333f18230e34b6a9b7
    (cherry picked from commit 23bf4227231eb081f906382ca05e7c2bea5612ec)

diff --git a/soltools/cpp/_eval.c b/soltools/cpp/_eval.c
index f10fa7988bb5..6849ca9deb93 100644
--- a/soltools/cpp/_eval.c
+++ b/soltools/cpp/_eval.c
@@ -318,7 +318,7 @@ long
                     }
                     continue;
                 }
-                /* flow through */
+                /* fall through */
 
                 /* plain binary */
             case EQ:
diff --git a/soltools/cpp/_lex.c b/soltools/cpp/_lex.c
index fde7605e8354..68ed6ade78bd 100644
--- a/soltools/cpp/_lex.c
+++ b/soltools/cpp/_lex.c
@@ -492,6 +492,7 @@ continue2:
 
                 case S_STNL:
                     error(ERROR, "Unterminated string or char const");
+                    /* fall through */
                 case S_NL:
                     tp->t = ip;
                     tp->type = NL;
@@ -516,6 +517,7 @@ continue2:
                 case S_EOFCOM:
                     error(WARNING, "EOF inside comment");
                     --ip;
+                    /* fall through */
                 case S_COMMENT:
                     if (!Cflag)
                     {


More information about the Libreoffice-commits mailing list