Skip to content

Commit 9518980

Browse files
committed
libc: Use explicit fallthrough annotations
Replace remaining comment-based switch fall-through annotations with explicit compiler-supported ones as defined by __PICOLIBC_FALLTHROUGH. Signed-off-by: Keith Packard <[email protected]>
1 parent 6c100c1 commit 9518980

File tree

6 files changed

+31
-19
lines changed

6 files changed

+31
-19
lines changed

newlib/libc/stdio/vfscanf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1576,7 +1576,7 @@ _SVFSCANF (
15761576
}
15771577
goto fskip;
15781578
}
1579-
/* Fall through. */
1579+
__PICOLIBC_FALLTHROUGH;
15801580
case '1':
15811581
case '2':
15821582
case '3':

newlib/libc/stdio/vfwscanf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,7 @@ _SVFWSCANF (
13301330
}
13311331
goto fskip;
13321332
}
1333-
/* Fall through. */
1333+
__PICOLIBC_FALLTHROUGH;
13341334
case L'1':
13351335
case L'2':
13361336
case L'3':

newlib/libc/time/strftime.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@ __strftime (CHAR *s, size_t maxsize, const CHAR *format,
10261026
break;
10271027
}
10281028
#endif /* _WANT_C99_TIME_FORMATS */
1029-
/*FALLTHRU*/
1029+
__PICOLIBC_FALLTHROUGH;
10301030
case CQ('k'): /* newlib extension */
10311031
len = t_snprintf (&s[count], maxsize - count,
10321032
*format == CQ('k') ? CQ("%2d") : CQ("%.2d"),
@@ -1036,7 +1036,7 @@ __strftime (CHAR *s, size_t maxsize, const CHAR *format,
10361036
case CQ('l'): /* newlib extension */
10371037
if (alt == CQ('O'))
10381038
alt = CQ('\0');
1039-
/*FALLTHRU*/
1039+
__PICOLIBC_FALLTHROUGH;
10401040
case CQ('I'):
10411041
{
10421042
register int h12;

newlib/libm/ld/ld80/e_lgammal_r.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -391,15 +391,19 @@ lgammal_r(long double x, int *signgamp)
391391
switch (i)
392392
{
393393
case 7:
394-
z *= (y + 6.0L); /* FALLTHRU */
394+
z *= (y + 6.0L);
395+
__PICOLIBC_FALLTHROUGH;
395396
case 6:
396-
z *= (y + 5.0L); /* FALLTHRU */
397+
z *= (y + 5.0L);
398+
__PICOLIBC_FALLTHROUGH;
397399
case 5:
398-
z *= (y + 4.0L); /* FALLTHRU */
400+
z *= (y + 4.0L);
401+
__PICOLIBC_FALLTHROUGH;
399402
case 4:
400-
z *= (y + 3.0L); /* FALLTHRU */
403+
z *= (y + 3.0L);
404+
__PICOLIBC_FALLTHROUGH;
401405
case 3:
402-
z *= (y + 2.0L); /* FALLTHRU */
406+
z *= (y + 2.0L);
403407
r += logl (z);
404408
break;
405409
}

newlib/libm/math/sr_lgamma.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -320,15 +320,19 @@ __math_lgamma_r(__float64 x, int *signgamp, int *divzero)
320320
z = one; /* lgamma(1+s) = log(s) + lgamma(s) */
321321
switch (i) {
322322
case 7:
323-
z *= (y + 6.0); /* FALLTHRU */
323+
z *= (y + 6.0);
324+
__PICOLIBC_FALLTHROUGH;
324325
case 6:
325-
z *= (y + 5.0); /* FALLTHRU */
326+
z *= (y + 5.0);
327+
__PICOLIBC_FALLTHROUGH;
326328
case 5:
327-
z *= (y + 4.0); /* FALLTHRU */
329+
z *= (y + 4.0);
330+
__PICOLIBC_FALLTHROUGH;
328331
case 4:
329-
z *= (y + 3.0); /* FALLTHRU */
332+
z *= (y + 3.0);
333+
__PICOLIBC_FALLTHROUGH;
330334
case 3:
331-
z *= (y + 2.0); /* FALLTHRU */
335+
z *= (y + 2.0);
332336
r += log64(z);
333337
break;
334338
}

newlib/libm/math/srf_lgamma.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,15 +252,19 @@ __math_lgammaf_r(float x, int *signgamp, int *divzero)
252252
z = one; /* lgamma(1+s) = log(s) + lgamma(s) */
253253
switch (i) {
254254
case 7:
255-
z *= (y + (float)6.0); /* FALLTHRU */
255+
z *= (y + (float)6.0);
256+
__PICOLIBC_FALLTHROUGH;
256257
case 6:
257-
z *= (y + (float)5.0); /* FALLTHRU */
258+
z *= (y + (float)5.0);
259+
__PICOLIBC_FALLTHROUGH;
258260
case 5:
259-
z *= (y + (float)4.0); /* FALLTHRU */
261+
z *= (y + (float)4.0);
262+
__PICOLIBC_FALLTHROUGH;
260263
case 4:
261-
z *= (y + (float)3.0); /* FALLTHRU */
264+
z *= (y + (float)3.0);
265+
__PICOLIBC_FALLTHROUGH;
262266
case 3:
263-
z *= (y + (float)2.0); /* FALLTHRU */
267+
z *= (y + (float)2.0);
264268
r += logf(z);
265269
break;
266270
}

0 commit comments

Comments
 (0)