encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Add and use `SDL_FALLTHROUGH` for fallthroughs" 

This reverts commit 66a08aa391.

This causes problems with older compilers:
https://github.com/libsdl-org/SDL/pull/4791#issuecomment-966630997
This commit is contained in:
Sam Lantinga 2021-11-11 15:58:44 -08:00
parent 36b2690e40
commit abc12a832c
15 changed files with 55 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/SDL_stdinc.h
View File

@ -496,13 +496,25 @@ SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords)
if (dwords == 0) { if (dwords == 0) {
return; return;
} }
/* !!! FIXME: there are better ways to do this, but this is just to clean this up for now. */
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
#endif
switch (dwords % 4) { switch (dwords % 4) {
case 0: do { *_p++ = _val; SDL_FALLTHROUGH; case 0: do { *_p++ = _val; /* fallthrough */
case 3: *_p++ = _val; SDL_FALLTHROUGH; case 3: *_p++ = _val; /* fallthrough */
case 2: *_p++ = _val; SDL_FALLTHROUGH; case 2: *_p++ = _val; /* fallthrough */
case 1: *_p++ = _val; case 1: *_p++ = _val; /* fallthrough */
} while ( --_n ); } while ( --_n );
} }
#ifdef __clang__
#pragma clang diagnostic pop
#endif
#endif #endif
} }

19
include/begin_code.h
View File

@ -164,22 +164,3 @@
#endif #endif
#endif /* NULL */ #endif /* NULL */
#endif /* ! Mac OS X - breaks precompiled headers */ #endif /* ! Mac OS X - breaks precompiled headers */
#ifndef SDL_FALLTHROUGH
#if (defined(__cplusplus) && __cplusplus >= 201703L) || \
(defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L)
#define SDL_FALLTHROUGH [[fallthrough]]
#else
#ifdef __has_attribute
#define _HAS_FALLTHROUGH __has_attribute(__fallthrough__)
#else
#define _HAS_FALLTHROUGH 0
#endif /* __has_attribute */
#if _HAS_FALLTHROUGH
#define SDL_FALLTHROUGH __attribute__((__fallthrough__))
#else
#define SDL_FALLTHROUGH do {} while (0) /* fallthrough */
#endif /* _HAS_FALLTHROUGH */
#undef _HAS_FALLTHROUGH
#endif /* C++17 or C2x */
#endif /* SDL_FALLTHROUGH not defined */

4
src/audio/SDL_wave.c
View File

@ -1715,7 +1715,7 @@ WaveCheckFormat(WaveFile *file, size_t datalength)
if (file->facthint == FactStrict && file->fact.status <= 0) { if (file->facthint == FactStrict && file->fact.status <= 0) {
return SDL_SetError("Missing fact chunk in WAVE file"); return SDL_SetError("Missing fact chunk in WAVE file");
} }
SDL_FALLTHROUGH; /* fallthrough */
case PCM_CODE: case PCM_CODE:
/* All supported formats require a non-zero bit depth. */ /* All supported formats require a non-zero bit depth. */
if (file->chunk.size < 16) { if (file->chunk.size < 16) {
@ -1854,7 +1854,7 @@ WaveLoad(SDL_RWops *src, WaveFile *file, SDL_AudioSpec *spec, Uint8 **audio_buf,
RIFFend = RIFFchunk.position + SDL_MAX_UINT32; RIFFend = RIFFchunk.position + SDL_MAX_UINT32;
break; break;
} }
SDL_FALLTHROUGH; /* fallthrough */
case RiffSizeForce: case RiffSizeForce:
RIFFend = RIFFchunk.position + RIFFchunk.length; RIFFend = RIFFchunk.position + RIFFchunk.length;
RIFFlengthknown = SDL_TRUE; RIFFlengthknown = SDL_TRUE;

8
src/render/software/SDL_draw.h
View File

@ -618,10 +618,10 @@ do { \
while (height--) { \ while (height--) { \
{ int n = (width+3)/4; \ { int n = (width+3)/4; \
switch (width & 3) { \ switch (width & 3) { \
case 0: do { op; pixel++; SDL_FALLTHROUGH; \ case 0: do { op; pixel++; /* fallthrough */ \
case 3: op; pixel++; SDL_FALLTHROUGH; \ case 3: op; pixel++; /* fallthrough */ \
case 2: op; pixel++; SDL_FALLTHROUGH; \ case 2: op; pixel++; /* fallthrough */ \
case 1: op; pixel++; \ case 1: op; pixel++; /* fallthrough */ \
} while ( --n > 0 ); \ } while ( --n > 0 ); \
} \ } \
} \ } \

4
src/stdlib/SDL_iconv.c
View File

@ -758,7 +758,7 @@ SDL_iconv(SDL_iconv_t cd,
if (ch > 0x10FFFF) { if (ch > 0x10FFFF) {
ch = UNKNOWN_UNICODE; ch = UNKNOWN_UNICODE;
} }
SDL_FALLTHROUGH; /* fallthrough */
case ENCODING_UCS4BE: case ENCODING_UCS4BE:
if (ch > 0x7FFFFFFF) { if (ch > 0x7FFFFFFF) {
ch = UNKNOWN_UNICODE; ch = UNKNOWN_UNICODE;
@ -780,7 +780,7 @@ SDL_iconv(SDL_iconv_t cd,
if (ch > 0x10FFFF) { if (ch > 0x10FFFF) {
ch = UNKNOWN_UNICODE; ch = UNKNOWN_UNICODE;
} }
SDL_FALLTHROUGH; /* fallthrough */
case ENCODING_UCS4LE: case ENCODING_UCS4LE:
if (ch > 0x7FFFFFFF) { if (ch > 0x7FFFFFFF) {
ch = UNKNOWN_UNICODE; ch = UNKNOWN_UNICODE;

12
src/stdlib/SDL_string.c
View File

@ -1275,7 +1275,7 @@ SDL_vsscanf(const char *text, const char *fmt, va_list ap)
} }
} }
} }
SDL_FALLTHROUGH; /* Fall through to %d handling */
case 'd': case 'd':
if (inttype == DO_LONGLONG) { if (inttype == DO_LONGLONG) {
Sint64 value; Sint64 value;
@ -1323,13 +1323,13 @@ SDL_vsscanf(const char *text, const char *fmt, va_list ap)
if (radix == 10) { if (radix == 10) {
radix = 8; radix = 8;
} }
SDL_FALLTHROUGH; /* Fall through to unsigned handling */
case 'x': case 'x':
case 'X': case 'X':
if (radix == 10) { if (radix == 10) {
radix = 16; radix = 16;
} }
SDL_FALLTHROUGH; /* Fall through to unsigned handling */
case 'u': case 'u':
if (inttype == DO_LONGLONG) { if (inttype == DO_LONGLONG) {
Uint64 value = 0; Uint64 value = 0;
@ -1815,7 +1815,7 @@ SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, const char *fmt,
case 'p': case 'p':
case 'x': case 'x':
info.force_case = SDL_CASE_LOWER; info.force_case = SDL_CASE_LOWER;
SDL_FALLTHROUGH; /* Fall through to 'X' handling */
case 'X': case 'X':
if (info.force_case == SDL_CASE_NOCHANGE) { if (info.force_case == SDL_CASE_NOCHANGE) {
info.force_case = SDL_CASE_UPPER; info.force_case = SDL_CASE_UPPER;
@ -1826,12 +1826,12 @@ SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, const char *fmt,
if (*fmt == 'p') { if (*fmt == 'p') {
inttype = DO_LONG; inttype = DO_LONG;
} }
SDL_FALLTHROUGH; /* Fall through to unsigned handling */
case 'o': case 'o':
if (info.radix == 10) { if (info.radix == 10) {
info.radix = 8; info.radix = 8;
} }
SDL_FALLTHROUGH; /* Fall through to unsigned handling */
case 'u': case 'u':
info.force_sign = SDL_FALSE; info.force_sign = SDL_FALSE;
if (info.precision >= 0) { if (info.precision >= 0) {

24
src/video/SDL_blit.h
View File

@ -479,14 +479,14 @@ do { \
#define DUFFS_LOOP8(pixel_copy_increment, width) \ #define DUFFS_LOOP8(pixel_copy_increment, width) \
{ int n = (width+7)/8; \ { int n = (width+7)/8; \
switch (width & 7) { \ switch (width & 7) { \
case 0: do { pixel_copy_increment; SDL_FALLTHROUGH; \ case 0: do { pixel_copy_increment; /* fallthrough */ \
case 7: pixel_copy_increment; SDL_FALLTHROUGH; \ case 7: pixel_copy_increment; /* fallthrough */ \
case 6: pixel_copy_increment; SDL_FALLTHROUGH; \ case 6: pixel_copy_increment; /* fallthrough */ \
case 5: pixel_copy_increment; SDL_FALLTHROUGH; \ case 5: pixel_copy_increment; /* fallthrough */ \
case 4: pixel_copy_increment; SDL_FALLTHROUGH; \ case 4: pixel_copy_increment; /* fallthrough */ \
case 3: pixel_copy_increment; SDL_FALLTHROUGH; \ case 3: pixel_copy_increment; /* fallthrough */ \
case 2: pixel_copy_increment; SDL_FALLTHROUGH; \ case 2: pixel_copy_increment; /* fallthrough */ \
case 1: pixel_copy_increment; \ case 1: pixel_copy_increment; /* fallthrough */ \
} while ( --n > 0 ); \ } while ( --n > 0 ); \
} \ } \
} }
@ -495,10 +495,10 @@ do { \
#define DUFFS_LOOP4(pixel_copy_increment, width) \ #define DUFFS_LOOP4(pixel_copy_increment, width) \
{ int n = (width+3)/4; \ { int n = (width+3)/4; \
switch (width & 3) { \ switch (width & 3) { \
case 0: do { pixel_copy_increment; SDL_FALLTHROUGH; \ case 0: do { pixel_copy_increment; /* fallthrough */ \
case 3: pixel_copy_increment; SDL_FALLTHROUGH; \ case 3: pixel_copy_increment; /* fallthrough */ \
case 2: pixel_copy_increment; SDL_FALLTHROUGH; \ case 2: pixel_copy_increment; /* fallthrough */ \
case 1: pixel_copy_increment; \ case 1: pixel_copy_increment; /* fallthrough */ \
} while (--n > 0); \ } while (--n > 0); \
} \ } \
} }

12
src/video/SDL_fillrect.c
View File

@ -145,13 +145,13 @@ SDL_FillRect1(Uint8 * pixels, int pitch, Uint32 color, int w, int h)
switch ((uintptr_t) p & 3) { switch ((uintptr_t) p & 3) {
case 1: case 1:
*p++ = (Uint8) color; *p++ = (Uint8) color;
--n; SDL_FALLTHROUGH; --n; /* fallthrough */
case 2: case 2:
*p++ = (Uint8) color; *p++ = (Uint8) color;
--n; SDL_FALLTHROUGH; --n; /* fallthrough */
case 3: case 3:
*p++ = (Uint8) color; *p++ = (Uint8) color;
--n; --n; /* fallthrough */
} }
SDL_memset4(p, color, (n >> 2)); SDL_memset4(p, color, (n >> 2));
} }
@ -159,11 +159,11 @@ SDL_FillRect1(Uint8 * pixels, int pitch, Uint32 color, int w, int h)
p += (n & ~3); p += (n & ~3);
switch (n & 3) { switch (n & 3) {
case 3: case 3:
*p++ = (Uint8) color; SDL_FALLTHROUGH; *p++ = (Uint8) color; /* fallthrough */
case 2: case 2:
*p++ = (Uint8) color; SDL_FALLTHROUGH; *p++ = (Uint8) color; /* fallthrough */
case 1: case 1:
*p++ = (Uint8) color; *p++ = (Uint8) color; /* fallthrough */
} }
} }
pixels += pitch; pixels += pitch;

2
src/video/SDL_pixels.c
View File

@ -333,7 +333,7 @@ SDL_MasksToPixelFormatEnum(int bpp, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask,
if (Rmask == 0) { if (Rmask == 0) {
return SDL_PIXELFORMAT_RGB555; return SDL_PIXELFORMAT_RGB555;
} }
SDL_FALLTHROUGH; /* fallthrough */
case 16: case 16:
if (Rmask == 0) { if (Rmask == 0) {
return SDL_PIXELFORMAT_RGB565; return SDL_PIXELFORMAT_RGB565;

2
src/video/directfb/SDL_DirectFB_WM.c
View File

@ -323,7 +323,7 @@ DirectFB_WM_ProcessEvent(_THIS, SDL_Window * window, DFBWindowEvent * evt)
} }
if (window->flags & SDL_WINDOW_MAXIMIZED) if (window->flags & SDL_WINDOW_MAXIMIZED)
return 1; return 1;
SDL_FALLTHROUGH; /* fall through */
default: default:
windata->wm_grab = pos; windata->wm_grab = pos;
if (grabbed_window != NULL) if (grabbed_window != NULL)

2
src/video/directfb/SDL_DirectFB_events.c
View File

@ -261,7 +261,7 @@ ProcessWindowEvent(_THIS, SDL_Window *sdlwin, DFBWindowEvent * evt)
SDL_SendWindowEvent(sdlwin, SDL_WINDOWEVENT_MOVED, SDL_SendWindowEvent(sdlwin, SDL_WINDOWEVENT_MOVED,
evt->x, evt->y); evt->x, evt->y);
} }
SDL_FALLTHROUGH; /* fall throught */
case DWET_SIZE: case DWET_SIZE:
/* FIXME: what about < 0 */ /* FIXME: what about < 0 */
evt->w -= (windata->theme.right_size + windata->theme.left_size); evt->w -= (windata->theme.right_size + windata->theme.left_size);

1
src/video/windows/SDL_windowsevents.c
View File

@ -729,7 +729,6 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
} }
} }
/* don't break here, fall through to check the wParam like the button presses */ /* don't break here, fall through to check the wParam like the button presses */
SDL_FALLTHROUGH;
case WM_LBUTTONUP: case WM_LBUTTONUP:
case WM_RBUTTONUP: case WM_RBUTTONUP:
case WM_MBUTTONUP: case WM_MBUTTONUP:

4
test/controllermap.c
View File

@ -562,7 +562,7 @@ WatchJoystick(SDL_Joystick * joystick)
if ((event.key.keysym.sym != SDLK_ESCAPE)) { if ((event.key.keysym.sym != SDLK_ESCAPE)) {
break; break;
} }
SDL_FALLTHROUGH; /* Fall through to signal quit */
case SDL_QUIT: case SDL_QUIT:
done = SDL_TRUE; done = SDL_TRUE;
break; break;
@ -755,7 +755,7 @@ main(int argc, char *argv[])
if ((event.key.keysym.sym != SDLK_ESCAPE)) { if ((event.key.keysym.sym != SDLK_ESCAPE)) {
break; break;
} }
SDL_FALLTHROUGH; /* Fall through to signal quit */
case SDL_QUIT: case SDL_QUIT:
done = SDL_TRUE; done = SDL_TRUE;
break; break;

2
test/testgamecontroller.c
View File

@ -394,7 +394,7 @@ loop(void *arg)
if (event.key.keysym.sym != SDLK_ESCAPE) { if (event.key.keysym.sym != SDLK_ESCAPE) {
break; break;
} }
SDL_FALLTHROUGH; /* Fall through to signal quit */
case SDL_QUIT: case SDL_QUIT:
done = SDL_TRUE; done = SDL_TRUE;
break; break;

2
test/testjoystick.c
View File

@ -186,7 +186,7 @@ loop(void *arg)
(event.key.keysym.sym != SDLK_AC_BACK)) { (event.key.keysym.sym != SDLK_AC_BACK)) {
break; break;
} }
SDL_FALLTHROUGH; /* Fall through to signal quit */
case SDL_FINGERDOWN: case SDL_FINGERDOWN:
case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONDOWN:
case SDL_QUIT: case SDL_QUIT: