Adjust wording of two fall-through comments.

In two places in glibc, -Wextra produces implicit-fallthrough warnings
where there are comments about the fall-through but their wording
doesn't match one of the forms expected by the default
implicit-fallthrough level.  This patch adjusts those two places to
have a comment in a form that is accepted, so avoiding the warning
(this seems preferable to only being able to use a looser level of the
warning that allows any comment at all as evidence of deliberate
fall-through).

Tested for x86_64.

	* iconvdata/cns11643.h (ucs4_to_cns11643): Adjust fall-through
	comment wording.
	* nis/nis_call.c (__do_niscall3): Likewise.

diff --git a/ChangeLog b/ChangeLog
index f8210cdb418679b57130ddfc59d23898480a41bc..74e640191c017189bb303fd247dd43a0fba6719a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2019-02-13  Joseph Myers  <joseph@codesourcery.com>
 
+       * iconvdata/cns11643.h (ucs4_to_cns11643): Adjust fall-through
+       comment wording.
+       * nis/nis_call.c (__do_niscall3): Likewise.
+
        * catgets/gencat.c (normalize_line): Use braces around empty
        'else' body.
        * include/stap-probe.h [!USE_STAP_PROBE && !__ASSEMBLER__]

diff --git a/iconvdata/cns11643.h b/iconvdata/cns11643.h
index 892e3f7b04fba4ccc1a3f3541267b39944daa1e7..c7b5ccc94d17980636f4243de98a4aaf249a1d30 100644 (file)
--- a/iconvdata/cns11643.h
+++ b/iconvdata/cns11643.h
@@ -220,7 +220,8 @@ ucs4_to_cns11643 (uint32_t wch, unsigned char *s, size_t avail)
       cp = __cns11643l1_from_ucs4_tab12[ch - 0x4e00];
       if (cp[0] != '\0')
        break;
-      /* FALLTHROUGH.  Let's try the other planes.  */
+      /* Let's try the other planes.  */
+      /* Fall through.  */
     case 0x3400 ... 0x4dff:
     case 0x9f9d ... 0x9fa5:
       /* Let's try the other planes.  */

diff --git a/nis/nis_call.c b/nis/nis_call.c
index 965b66991eee67e2a59d1aec2b85eae4293ce29e..58e3a4dc5494066008e5904d3f0bb94402c84fad 100644 (file)
--- a/nis/nis_call.c
+++ b/nis/nis_call.c
@@ -325,6 +325,7 @@ __do_niscall3 (dir_binding *dbp, u_long prog, xdrproc_t xargs, caddr_t req,
                }
              /* Yes, the missing break is correct. If we doesn't have to
                 start a callback, look if we have to search another server */
+             /* Fall through.  */
            case NIS_LOOKUP:
            case NIS_ADD:
            case NIS_MODIFY: