Fix fallthrough warnings from gcc using gnulib's FALLTHROUGH macro

diff --git a/src/common.h b/src/common.h
index 9865dd013a6fa19dfac2348412ff330e929a8c58..54ecae07e3e6e9d5a048b71f1bbb41219b585a78 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -42,6 +42,14 @@
 #endif
 #define N_(Text) Text
 
+#ifndef FALLTHROUGH
+# if __GNUC__ < 7
+#  define FALLTHROUGH ((void) 0)
+# else
+#  define FALLTHROUGH __attribute__ ((__fallthrough__))
+# endif
+#endif
+
 /* Generate a mask of LENGTH one-bits, right justified in a word.  */
 #define BIT_MASK(Length) ((1U << (Length)) - 1)
 

diff --git a/src/endline.c b/src/endline.c
index a52455a241b3396305d5d8a7bcf2c5bc3b8301fe..0128243c3de60699b311b334fa06686e89635019 100644 (file)
--- a/src/endline.c
+++ b/src/endline.c
@@ -44,7 +44,7 @@ transform_data_cr (RECODE_SUBTASK subtask)
            break;
          }
        RETURN_IF_NOGO (RECODE_AMBIGUOUS_OUTPUT, subtask);
-       /* Fall through.  */
+       FALLTHROUGH;
 
       default:
        put_byte (character, subtask);
@@ -73,7 +73,7 @@ transform_cr_data (RECODE_SUBTASK subtask)
            break;
          }
        RETURN_IF_NOGO (RECODE_AMBIGUOUS_OUTPUT, subtask);
-       /* Fall through.  */
+       FALLTHROUGH;
 
       default:
        put_byte (character, subtask);
@@ -105,7 +105,7 @@ transform_data_crlf (RECODE_SUBTASK subtask)
 
       case OLD_EOF:
        RETURN_IF_NOGO (RECODE_AMBIGUOUS_OUTPUT, subtask);
-       /* Fall through.  */
+       FALLTHROUGH;
 
       default:
        put_byte (character, subtask);
@@ -140,7 +140,7 @@ transform_crlf_data (RECODE_SUBTASK subtask)
 
       case LF:
        RETURN_IF_NOGO (RECODE_AMBIGUOUS_OUTPUT, subtask);
-       /* Fall through.  */
+       FALLTHROUGH;
 
       default:
        put_byte (character, subtask);

diff --git a/src/ibmpc.c b/src/ibmpc.c
index 11f5510a996607ede65adcfd536c91929ec8dfa6..068cc3e57f308fe835cc226b5fba23f1358073d2 100644 (file)
--- a/src/ibmpc.c
+++ b/src/ibmpc.c
@@ -236,7 +236,7 @@ transform_ibmpc_latin1 (RECODE_SUBTASK subtask)
 
          case DOS_LF:
            RETURN_IF_NOGO (RECODE_AMBIGUOUS_OUTPUT, subtask);
-           /* Fall through.  */
+           FALLTHROUGH;
 
          default:
            put_byte (table[input_char], subtask);
@@ -272,7 +272,7 @@ transform_ibmpc_latin1 (RECODE_SUBTASK subtask)
 
          case DOS_LF:
            RETURN_IF_NOGO (RECODE_AMBIGUOUS_OUTPUT, subtask);
-           /* Fall through.  */
+           FALLTHROUGH;
 
          default:
            if (table[input_char])

diff --git a/src/iconqnx.c b/src/iconqnx.c
index 6ca1f327661258db144e39ddb4990729efbe1b32..cab506613d300514863cd7a548d8f8f53842aef7 100644 (file)
--- a/src/iconqnx.c
+++ b/src/iconqnx.c
@@ -45,7 +45,7 @@ transform_ibmpc_iconqnx (RECODE_SUBTASK subtask)
       {
       case DOS_EOF:
        RETURN_IF_NOGO (RECODE_NOT_CANONICAL, subtask);
-       /* Fall through.  */
+       FALLTHROUGH;
 
       case EOF:
        SUBTASK_RETURN (subtask);
@@ -80,7 +80,7 @@ transform_ibmpc_iconqnx (RECODE_SUBTASK subtask)
       case ENDLINE:
       case ESCAPE:
        RETURN_IF_NOGO (RECODE_AMBIGUOUS_OUTPUT, subtask);
-       /* Fall through.  */
+       FALLTHROUGH;
 
       default:
        put_byte (input_char, subtask);
@@ -208,7 +208,7 @@ transform_iconqnx_ibmpc (RECODE_SUBTASK subtask)
            if (input_char == EOF)
              SUBTASK_RETURN (subtask);
          }
-       /* Fall through.  */
+       FALLTHROUGH;
 
       default:
        put_byte (input_char, subtask);

diff --git a/src/recode.c b/src/recode.c
index 427ba4a20ddaae596ee15306bb599c5517e0e96f..6866992a905218c0f09dee17497ffb837e242323 100644 (file)
--- a/src/recode.c
+++ b/src/recode.c
@@ -680,6 +680,7 @@ recode_format_table (RECODE_REQUEST request,
                        column += 2;
                        break;
                      }
+                    FALLTHROUGH;
 
                  default:
                    if (isprint (*cursor2))