From patchwork Wed Feb 13 18:30:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 31440 Received: (qmail 68739 invoked by alias); 13 Feb 2019 18:30:35 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 68728 invoked by uid 89); 13 Feb 2019 18:30:35 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=evidence X-HELO: relay1.mentorg.com Date: Wed, 13 Feb 2019 18:30:27 +0000 From: Joseph Myers To: Subject: Adjust wording of two fall-through comments Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 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. 2019-02-13 Joseph Myers * iconvdata/cns11643.h (ucs4_to_cns11643): Adjust fall-through comment wording. * nis/nis_call.c (__do_niscall3): Likewise. Reviewed-by: Jonathan Nieder 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: