[Libreoffice-commits] core.git: rsc/source

[Stephan Bergmann]

 rsc/source/rscpp/cpp1.c |    3 +++
 rsc/source/rscpp/cpp2.c |    1 +
 rsc/source/rscpp/cpp4.c |    3 ++-
 rsc/source/rscpp/cpp5.c |    1 +
 rsc/source/rscpp/cpp6.c |    2 +-
 5 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit b593c9c5b80bff9651cfde8f7c204b5d8e811155
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 27 11:36:23 2017 +0100

    -Werror=implicit-fallthrough= (GCC 7)
    
    Change-Id: I9d6c7e5a03aea56d8db84c2ba06c63efb0e007fa

diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c
index 4724b53..03d75f4 100644
--- a/rsc/source/rscpp/cpp1.c
+++ b/rsc/source/rscpp/cpp1.c
@@ -278,6 +278,7 @@ int MAIN(int argc, char** argv)
                 }
             }                           /* Continue by opening output    */
         }
+        /* fall through */
 #endif
     case 3:
         /*
@@ -293,6 +294,7 @@ int MAIN(int argc, char** argv)
                 exit(IO_ERROR);
             }
         }                           /* Continue by opening input    */
+        /* fall through */
     case 2:                         /* One file -> stdin            */
         /*
          * Open input file, "-" means use stdin.
@@ -309,6 +311,7 @@ int MAIN(int argc, char** argv)
             strncpy(work, useargv[1], NWORK);  /* Remember input filename      */
             break;
         }                           /* Else, just get stdin         */
+        /* fall through */
     case 0:                         /* No args?                     */
     case 1:                         /* No files, stdin -> stdout    */
         work[0] = EOS;              /* Unix can't find stdin name   */
diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c
index c181bef..2cbc90d 100644
--- a/rsc/source/rscpp/cpp2.c
+++ b/rsc/source/rscpp/cpp2.c
@@ -120,6 +120,7 @@ int control(int counter)
             if (++ifptr >= &ifstack[BLK_NEST])
                 goto if_nest_err;
             *ifptr = 0;                     /* !WAS_COMPILING       */
+            /* fall through */
         case L_line:                        /* Many                 */
             /*
              * Are pragma's always processed?
diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c
index d8e0345..d8009d2 100644
--- a/rsc/source/rscpp/cpp4.c
+++ b/rsc/source/rscpp/cpp4.c
@@ -190,7 +190,7 @@ void dodefine()
                 break;                      /* spaces               */
             else if (c == '\t')
                 c = ' ';                    /* Normalize tabs       */
-            /* Fall through to store character                      */
+            /* fall through *//* to store character                 */
         default:                            /* Other character      */
             save(c);
             break;
@@ -461,6 +461,7 @@ void expand(DEFBUF* tokenp)
                 dumpparm("expand");
 #endif
         }                           /* Collect arguments            */
+        /* fall through */
     case DEF_NOARGS:                /* No parameters just stuffs    */
         expstuff(tokenp);           /* Do actual parameters         */
     }                               /* nargs switch                 */
diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index b938fcc..e64a3e0 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -352,6 +352,7 @@ again:
                        opname[(int)opp->op]);
                 return 1;
             }
+            /* fall through */
         /*
          * Evaluate op1.
          */
diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c
index 3678caa..1f6bd68 100644
--- a/rsc/source/rscpp/cpp6.c
+++ b/rsc/source/rscpp/cpp6.c
@@ -902,7 +902,7 @@ int get()
 #ifdef STRICT_COMMENTS
                     cwarn("Nested comments", NULLST);
 #endif
-                    /* Fall into * stuff    */
+                    /* fall through *//* into * stuff */
                 case '*':
                     if ((c = get()) != '/')     /* If comment doesn't   */
                         goto test;              /* end, look at next    */