diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2019-02-13 18:37:54 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2019-02-13 18:37:54 +0000 |
| commit | 107562682c8f6a5736a0a8257428c15a3c68a165 (patch) | |
| tree | 6c838312cc386f4b0262ced880b6c27a2e126834 | |
| parent | 0538372096e50d9cf0ab8bd413cf7b561a1b85d7 (diff) | |
| download | glibc-107562682c8f6a5736a0a8257428c15a3c68a165.tar.gz glibc-107562682c8f6a5736a0a8257428c15a3c68a165.tar.xz glibc-107562682c8f6a5736a0a8257428c15a3c68a165.zip | |
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.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | iconvdata/cns11643.h | 3 | ||||
| -rw-r--r-- | nis/nis_call.c | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index f8210cdb41..74e640191c 100644 --- 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 892e3f7b04..c7b5ccc94d 100644 --- 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 965b66991e..58e3a4dc54 100644 --- 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: |