[PATCH] Cleanup some recently added whitespace.
Adhemerval Zanella Netto
adhemerval.zanella@linaro.org
Thu Oct 30 11:52:14 GMT 2025
On 29/10/25 22:34, Collin Funk wrote:
> This whitespace was mistakenly added in commit
> 970364dac00b38333e5b2d91c90d11e80141d265 which converted
> /* FALLTHROUGH */ comments to C23's [[fallthrough]].
>
> -- 8< --
>
> Hi Adhemerval,
>
> Apologies, I should have caught this when reviewing your commit but
> I was moreso focused on the compiler support. I assume it was just
> a regex that needed to be a bit more complex.
>
> Okay to commit?
Thanks for catching this. I think I let my editor to select the
expected indetantion and it failed on some cases. It is really annyoing
to work with this code that have wrong assumption than current code
guidelines
>
> ---
> locale/programs/charmap.c | 4 ++--
> locale/programs/locfile-kw.h | 6 +++---
> locale/programs/repertoire.c | 4 ++--
> malloc/mcheck-impl.c | 2 +-
> misc/mntent_r.c | 4 ++--
> nis/nis_call.c | 2 +-
> nptl/pthread_mutex_trylock.c | 2 +-
> nptl/pthread_mutex_unlock.c | 2 +-
> nss/digits_dots.c | 2 +-
> posix/execvpe.c | 2 +-
> posix/wordexp.c | 4 ++--
> resolv/base64.c | 2 +-
> resolv/ns_ttl.c | 8 ++++----
> resolv/nss_dns/dns-host.c | 4 ++--
> resolv/res_hconf.c | 2 +-
> resolv/res_query.c | 6 +++---
> stdio-common/printf-parsemb.c | 2 +-
> stdio-common/vfscanf-internal.c | 2 +-
> sunrpc/svc_unix.c | 2 +-
> sunrpc/xdr.c | 12 ++++++------
> sysdeps/ieee754/ldbl-96/e_lgammal_r.c | 8 ++++----
> sysdeps/x86/cpu-features.c | 6 +++---
> sysdeps/x86/readelflib.c | 2 +-
> time/strftime_l.c | 4 ++--
> time/strptime_l.c | 4 ++--
> 25 files changed, 49 insertions(+), 49 deletions(-)
>
> diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
> index 6927f9be7e..cdcc7312ba 100644
> --- a/locale/programs/charmap.c
> +++ b/locale/programs/charmap.c
> @@ -548,7 +548,7 @@ character sets with locking states are not supported"));
> state = 4;
> continue;
> }
> - [[fallthrough]] ;
> + [[fallthrough]];
>
> case 5:
> if (nowtok != tok_charcode)
> @@ -712,7 +712,7 @@ only WIDTH definitions are allowed to follow the CHARMAP definition"));
> state = 95;
> continue;
> }
> - [[fallthrough]] ;
> + [[fallthrough]];
>
> case 96:
> if (nowtok != tok_number)
> diff --git a/locale/programs/locfile-kw.h b/locale/programs/locfile-kw.h
> index dd7ea27615..f77cf439ff 100644
> --- a/locale/programs/locfile-kw.h
> +++ b/locale/programs/locfile-kw.h
> @@ -105,18 +105,18 @@ hash (register const char *str, register size_t len)
> {
> default:
> hval += asso_values[(unsigned char)str[8]];
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 8:
> case 7:
> case 6:
> case 5:
> hval += asso_values[(unsigned char)str[4]];
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 4:
> case 3:
> case 2:
> hval += asso_values[(unsigned char)str[1]];
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 1:
> hval += asso_values[(unsigned char)str[0]];
> break;
> diff --git a/locale/programs/repertoire.c b/locale/programs/repertoire.c
> index 591d952fad..365d9e60f0 100644
> --- a/locale/programs/repertoire.c
> +++ b/locale/programs/repertoire.c
> @@ -206,7 +206,7 @@ argument to <%s> must be a single character"),
>
> /* Otherwise we start reading the character definitions. */
> state = 2;
> - [[fallthrough]] ;
> + [[fallthrough]];
>
> case 2:
> /* We are now are in the body. Each line
> @@ -254,7 +254,7 @@ argument to <%s> must be a single character"),
> state = 4;
> continue;
> }
> - [[fallthrough]] ;
> + [[fallthrough]];
>
> case 5:
> /* We expect a value of the form <Uxxxx> or <Uxxxxxxxx> where
> diff --git a/malloc/mcheck-impl.c b/malloc/mcheck-impl.c
> index 6f60c8fa34..32d14a2bae 100644
> --- a/malloc/mcheck-impl.c
> +++ b/malloc/mcheck-impl.c
> @@ -389,7 +389,7 @@ __mcheck_initialize (void (*func) (enum mcheck_status), bool in_pedantic)
> case -1:
> /* Called before the first malloc was called. */
> __debug_free (__debug_malloc (0));
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 0:
> /* Called through the initializer hook. */
> __malloc_debug_enable (MALLOC_MCHECK_HOOK);
> diff --git a/misc/mntent_r.c b/misc/mntent_r.c
> index 26e8ade30e..c5c3918f58 100644
> --- a/misc/mntent_r.c
> +++ b/misc/mntent_r.c
> @@ -167,10 +167,10 @@ get_mnt_entry (FILE *stream, struct mntent *mp, char *buffer, int bufsiz)
> {
> case 0:
> mp->mnt_freq = 0;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 1:
> mp->mnt_passno = 0;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 2:
> break;
> }
> diff --git a/nis/nis_call.c b/nis/nis_call.c
> index 357bfadbbc..16041c1ab3 100644
> --- a/nis/nis_call.c
> +++ b/nis/nis_call.c
> @@ -324,7 +324,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 */
> - [[fallthrough]] ;
> + [[fallthrough]];
> case NIS_LOOKUP:
> case NIS_ADD:
> case NIS_MODIFY:
> diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c
> index bba550683b..c1ab3606b0 100644
> --- a/nptl/pthread_mutex_trylock.c
> +++ b/nptl/pthread_mutex_trylock.c
> @@ -68,7 +68,7 @@ ___pthread_mutex_trylock (pthread_mutex_t *mutex)
>
> case PTHREAD_MUTEX_TIMED_NP:
> FORCE_ELISION (mutex, goto elision);
> - [[fallthrough]] ;
> + [[fallthrough]];
> case PTHREAD_MUTEX_ADAPTIVE_NP:
> case PTHREAD_MUTEX_ERRORCHECK_NP:
> if (lll_trylock (mutex->__data.__lock) != 0)
> diff --git a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c
> index ef224c09e5..19cd2dcdb7 100644
> --- a/nptl/pthread_mutex_unlock.c
> +++ b/nptl/pthread_mutex_unlock.c
> @@ -319,7 +319,7 @@ __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr)
> if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid)
> || (mutex->__data.__lock & ~ PTHREAD_MUTEX_PRIO_CEILING_MASK) == 0)
> return EPERM;
> - [[fallthrough]] ;
> + [[fallthrough]];
>
> case PTHREAD_MUTEX_PP_NORMAL_NP:
> case PTHREAD_MUTEX_PP_ADAPTIVE_NP:
> diff --git a/nss/digits_dots.c b/nss/digits_dots.c
> index 7de92344ca..8cfb342626 100644
> --- a/nss/digits_dots.c
> +++ b/nss/digits_dots.c
> @@ -230,7 +230,7 @@ __nss_hostname_digits_dots_context (struct resolv_context *ctx,
> addr_size = IN6ADDRSZ;
> break;
> }
> - [[fallthrough]] ;
> + [[fallthrough]];
>
> case AF_INET:
> /* This is not possible. We cannot represent an IPv6 address
> diff --git a/posix/execvpe.c b/posix/execvpe.c
> index 52115055df..c139dfe8fd 100644
> --- a/posix/execvpe.c
> +++ b/posix/execvpe.c
> @@ -149,7 +149,7 @@ __execvpe_common (const char *file, char *const argv[], char *const envp[],
> up finding no executable we can use, we want to diagnose
> that we did find one but were denied access. */
> got_eacces = true;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case ENOENT:
> case ESTALE:
> case ENOTDIR:
> diff --git a/posix/wordexp.c b/posix/wordexp.c
> index 88058278b0..c6fefa0089 100644
> --- a/posix/wordexp.c
> +++ b/posix/wordexp.c
> @@ -783,7 +783,7 @@ parse_arith (char **word, size_t *word_length, size_t *max_length,
>
> case '(':
> ++paren_depth;
> - [[fallthrough]] ;
> + [[fallthrough]];
> default:
> expr = w_addchar (expr, &expr_length, &expr_maxlen, words[*offset]);
> if (expr == NULL)
> @@ -2103,7 +2103,7 @@ parse_backtick (char **word, size_t *word_length, size_t *max_length,
>
> case '\'':
> squoting = 1 - squoting;
> - [[fallthrough]] ;
> + [[fallthrough]];
> default:
> comm = w_addchar (comm, &comm_length, &comm_maxlen, words[*offset]);
> if (comm == NULL)
> diff --git a/resolv/base64.c b/resolv/base64.c
> index b09292e067..805993ac54 100644
> --- a/resolv/base64.c
> +++ b/resolv/base64.c
> @@ -275,7 +275,7 @@ b64_pton (char const *src, u_char *target, size_t targsize)
> return (-1);
> ch = *src++; /* Skip the = */
> /* Fall through to "single trailing =" case. */
> - [[fallthrough]] ;
> + [[fallthrough]];
>
> case 3: /* Valid, means two bytes of info */
> /*
> diff --git a/resolv/ns_ttl.c b/resolv/ns_ttl.c
> index e29be12920..5156b9d4df 100644
> --- a/resolv/ns_ttl.c
> +++ b/resolv/ns_ttl.c
> @@ -113,13 +113,13 @@ ns_parse_ttl(const char *src, u_long *dst) {
> ch = toupper(ch);
> switch (ch) {
> case 'W': tmp *= 7;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 'D': tmp *= 24;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 'H': tmp *= 60;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 'M': tmp *= 60;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 'S': break;
> default: goto einval;
> }
> diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
> index d8856653d8..8e5d8e1f6e 100644
> --- a/resolv/nss_dns/dns-host.c
> +++ b/resolv/nss_dns/dns-host.c
> @@ -235,7 +235,7 @@ gethostbyname3_context (struct resolv_context *ctx,
> case EMFILE:
> case ENFILE:
> h_errno = NETDB_INTERNAL;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case ECONNREFUSED:
> case ETIMEDOUT:
> status = NSS_STATUS_UNAVAIL;
> @@ -444,7 +444,7 @@ _nss_dns_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,
> case EMFILE:
> case ENFILE:
> h_errno = NETDB_INTERNAL;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case ECONNREFUSED:
> case ETIMEDOUT:
> status = NSS_STATUS_UNAVAIL;
> diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
> index 760de69664..964cbb7a5c 100644
> --- a/resolv/res_hconf.c
> +++ b/resolv/res_hconf.c
> @@ -146,7 +146,7 @@ arg_trimdomain_list (const char *fname, int line_num, const char *args)
> free (buf);
> return NULL;
> }
> - [[fallthrough]] ;
> + [[fallthrough]];
> default:
> break;
> }
> diff --git a/resolv/res_query.c b/resolv/res_query.c
> index 1eb2287fee..039c25a3c3 100644
> --- a/resolv/res_query.c
> +++ b/resolv/res_query.c
> @@ -277,7 +277,7 @@ __res_context_query (struct resolv_context *ctx, const char *name,
> || (hp2->rcode == NOERROR
> && ntohs (hp2->ancount) != 0))
> goto success;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case REFUSED:
> default:
> RES_SET_H_ERRNO(statp, NO_RECOVERY);
> @@ -477,7 +477,7 @@ __res_context_search (struct resolv_context *ctx,
> switch (statp->res_h_errno) {
> case NO_DATA:
> got_nodata++;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case HOST_NOT_FOUND:
> /* keep trying */
> break;
> @@ -487,7 +487,7 @@ __res_context_search (struct resolv_context *ctx,
> got_servfail++;
> break;
> }
> - [[fallthrough]] ;
> + [[fallthrough]];
> default:
> /* anything else implies that we're done */
> done++;
> diff --git a/stdio-common/printf-parsemb.c b/stdio-common/printf-parsemb.c
> index 21625036d7..23aefd89bf 100644
> --- a/stdio-common/printf-parsemb.c
> +++ b/stdio-common/printf-parsemb.c
> @@ -272,7 +272,7 @@ __parse_one_specmb (const UCHAR_T *format, size_t posn,
> if (*format != L_('l'))
> break;
> ++format;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case L_('L'):
> /* doubles are long doubles, and ints are long long ints. */
> case L_('q'):
> diff --git a/stdio-common/vfscanf-internal.c b/stdio-common/vfscanf-internal.c
> index 0870a42c4e..4fa6138ead 100644
> --- a/stdio-common/vfscanf-internal.c
> +++ b/stdio-common/vfscanf-internal.c
> @@ -1258,7 +1258,7 @@ __vfscanf_internal (FILE *s, const char *format, va_list argptr,
> }
> break;
> }
> - [[fallthrough]] ;
> + [[fallthrough]];
>
> case L_('S'):
> {
> diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c
> index c8559ea265..e42529700e 100644
> --- a/sunrpc/svc_unix.c
> +++ b/sunrpc/svc_unix.c
> @@ -440,7 +440,7 @@ readunix (char *xprtptr, char *buf, int len)
> case -1:
> if (errno == EINTR)
> continue;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 0:
> goto fatal_err;
> default:
> diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c
> index e8752a3e52..1d9643afc6 100644
> --- a/sunrpc/xdr.c
> +++ b/sunrpc/xdr.c
> @@ -113,7 +113,7 @@ xdr_int (XDR *xdrs, int *ip)
> return FALSE;
> }
> *ip = (int) l;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case XDR_FREE:
> return TRUE;
> }
> @@ -153,7 +153,7 @@ xdr_u_int (XDR *xdrs, u_int *up)
> return FALSE;
> }
> *up = (u_int) (u_long) l;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case XDR_FREE:
> return TRUE;
> }
> @@ -508,7 +508,7 @@ xdr_enum (XDR *xdrs, enum_t *ep)
> return FALSE;
> }
> *ep = l;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case XDR_FREE:
> return TRUE;
>
> @@ -631,7 +631,7 @@ xdr_bytes (XDR *xdrs, char **cpp, u_int *sizep, u_int maxsize)
> (void) __fxprintf (NULL, "%s: %s", __func__, _("out of memory\n"));
> return FALSE;
> }
> - [[fallthrough]] ;
> + [[fallthrough]];
>
> case XDR_ENCODE:
> return xdr_opaque (xdrs, sp, nodesize);
> @@ -752,7 +752,7 @@ xdr_string (XDR *xdrs, char **cpp, u_int maxsize)
> {
> return TRUE; /* already free */
> }
> - [[fallthrough]] ;
> + [[fallthrough]];
> case XDR_ENCODE:
> if (sp == NULL)
> return FALSE;
> @@ -792,7 +792,7 @@ xdr_string (XDR *xdrs, char **cpp, u_int maxsize)
> return FALSE;
> }
> sp[size] = 0;
> - [[fallthrough]] ;
> + [[fallthrough]];
>
> case XDR_ENCODE:
> return xdr_opaque (xdrs, sp, size);
> diff --git a/sysdeps/ieee754/ldbl-96/e_lgammal_r.c b/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
> index 7e373201ee..94bdc54b30 100644
> --- a/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
> +++ b/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
> @@ -402,16 +402,16 @@ __ieee754_lgammal_r (long double x, int *signgamp)
> {
> case 7:
> z *= (y + 6.0); /* FALLTHRU */
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 6:
> z *= (y + 5.0); /* FALLTHRU */
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 5:
> z *= (y + 4.0); /* FALLTHRU */
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 4:
> z *= (y + 3.0); /* FALLTHRU */
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 3:
> z *= (y + 2.0); /* FALLTHRU */
> r += __ieee754_logl (z);
> diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
> index d3409a5b3f..5d4437ffdf 100644
> --- a/sysdeps/x86/cpu-features.c
> +++ b/sysdeps/x86/cpu-features.c
> @@ -798,7 +798,7 @@ init_cpu_features (struct cpu_features *cpu_features)
> processor. */
> if (stepping > 0xc)
> break;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case INTEL_BIGCORE_SKYLAKE:
> /* Disable Intel TSX and enable RTM_ALWAYS_ABORT for
> processors listed in:
> @@ -937,7 +937,7 @@ disable_tsx:
> non-temporal on all Skylake servers. */
> cpu_features->preferred[index_arch_Avoid_Non_Temporal_Memset]
> |= bit_arch_Avoid_Non_Temporal_Memset;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case INTEL_BIGCORE_COMETLAKE:
> case INTEL_BIGCORE_SKYLAKE:
> case INTEL_BIGCORE_KABYLAKE:
> @@ -1091,7 +1091,7 @@ disable_tsx:
> /* Yongfeng and Shijidadao mircoarch tuning. */
> case 0x5b:
> cpu_features->cachesize_non_temporal_divisor = 2;
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 0x6b:
> cpu_features->preferred[index_arch_AVX_Fast_Unaligned_Load]
> &= ~bit_arch_AVX_Fast_Unaligned_Load;
> diff --git a/sysdeps/x86/readelflib.c b/sysdeps/x86/readelflib.c
> index 9b9d626176..75e11387d7 100644
> --- a/sysdeps/x86/readelflib.c
> +++ b/sysdeps/x86/readelflib.c
> @@ -44,7 +44,7 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
> case EM_386:
> if (elf_header->e_ident[EI_CLASS] == ELFCLASS32)
> break;
> - [[fallthrough]] ;
> + [[fallthrough]];
> default:
> error (0, 0, _("%s is for unknown machine %d.\n"),
> file_name, elf_header->e_machine);
> diff --git a/time/strftime_l.c b/time/strftime_l.c
> index 307e7e8fd6..1fcf038851 100644
> --- a/time/strftime_l.c
> +++ b/time/strftime_l.c
> @@ -1093,7 +1093,7 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
> #if !defined _NL_CURRENT && HAVE_STRFTIME
> format_char = L_('p');
> #endif
> - [[fallthrough]] ;
> + [[fallthrough]];
>
> case L_('p'):
> if (change_case)
> @@ -1433,7 +1433,7 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format,
>
> case L_('\0'): /* GNU extension: % at end of format. */
> --f;
> - [[fallthrough]] ;
> + [[fallthrough]];
> default:
> /* Unknown format; output the format, including the '%',
> since this is most likely the right thing to do if a
> diff --git a/time/strptime_l.c b/time/strptime_l.c
> index 7e6f974aeb..e9b20fc507 100644
> --- a/time/strptime_l.c
> +++ b/time/strptime_l.c
> @@ -552,7 +552,7 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
> s.decided = raw;
> }
> #endif
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 'D':
> /* Match standard day format. */
> if (!recursive (HERE_D_FMT))
> @@ -706,7 +706,7 @@ __strptime_internal (const char *rp, const char *fmt, struct tm *tmp,
> s.decided = raw;
> }
> #endif
> - [[fallthrough]] ;
> + [[fallthrough]];
> case 'T':
> if (!recursive (HERE_T_FMT))
> return NULL;
More information about the Libc-alpha
mailing list