Commit 1402d1355695d3a4bff0d2c96fcbcbe86ac2bec4
2023-03-18T20:34:38
video/blit: fix -Wimplicit-fallthrough warnings (cherry picked from commit f7961b7c9ad598b031cd033f19e93c6d882e8e41)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
index 45c8f5d..5995b4a 100644
--- a/src/joystick/linux/SDL_sysjoystick.c
+++ b/src/joystick/linux/SDL_sysjoystick.c
@@ -1487,6 +1487,7 @@ static void HandleInputEvents(SDL_Joystick *joystick)
HandleHat(joystick, hat_index, code % 2, events[i].value);
break;
}
+ SDL_FALLTHROUGH;
default:
events[i].value = AxisCorrect(joystick, code, events[i].value);
SDL_PrivateJoystickAxis(joystick,
@@ -1569,6 +1570,7 @@ static void HandleClassicEvents(SDL_Joystick *joystick)
HandleHat(joystick, hat_index, code % 2, events[i].value);
break;
}
+ SDL_FALLTHROUGH;
default:
SDL_PrivateJoystickAxis(joystick,
joystick->hwdata->abs_map[code],
diff --git a/src/video/SDL_blit_1.c b/src/video/SDL_blit_1.c
index 5077334..ba56979 100644
--- a/src/video/SDL_blit_1.c
+++ b/src/video/SDL_blit_1.c
@@ -140,6 +140,7 @@ static void Blit1to2(SDL_BlitInfo *info)
case 3:
*(Uint16 *)dst = map[*src++];
dst += 2;
+ SDL_FALLTHROUGH;
case 2:
*(Uint32 *)dst = (map[src[HI]] << 16) | (map[src[LO]]);
src += 2;
@@ -169,6 +170,7 @@ static void Blit1to2(SDL_BlitInfo *info)
case 3:
*(Uint16 *)dst = map[*src++];
dst += 2;
+ SDL_FALLTHROUGH;
case 2:
*(Uint32 *)dst = (map[src[HI]] << 16) | (map[src[LO]]);
src += 2;
@@ -270,8 +272,10 @@ static void Blit1to4(SDL_BlitInfo *info)
switch (width & 3) {
case 3:
*dst++ = map[*src++];
+ SDL_FALLTHROUGH;
case 2:
*dst++ = map[*src++];
+ SDL_FALLTHROUGH;
case 1:
*dst++ = map[*src++];
}
diff --git a/src/video/SDL_blit_N.c b/src/video/SDL_blit_N.c
index ba37472..4bde9df 100644
--- a/src/video/SDL_blit_N.c
+++ b/src/video/SDL_blit_N.c
@@ -999,9 +999,11 @@ static void Blit_RGB888_index8(SDL_BlitInfo *info)
case 3:
RGB888_RGB332(*dst++, *src);
++src;
+ SDL_FALLTHROUGH;
case 2:
RGB888_RGB332(*dst++, *src);
++src;
+ SDL_FALLTHROUGH;
case 1:
RGB888_RGB332(*dst++, *src);
++src;
@@ -1043,10 +1045,12 @@ static void Blit_RGB888_index8(SDL_BlitInfo *info)
RGB888_RGB332(Pixel, *src);
*dst++ = map[Pixel];
++src;
+ SDL_FALLTHROUGH;
case 2:
RGB888_RGB332(Pixel, *src);
*dst++ = map[Pixel];
++src;
+ SDL_FALLTHROUGH;
case 1:
RGB888_RGB332(Pixel, *src);
*dst++ = map[Pixel];
@@ -1109,9 +1113,11 @@ static void Blit_RGB101010_index8(SDL_BlitInfo *info)
case 3:
RGB101010_RGB332(*dst++, *src);
++src;
+ SDL_FALLTHROUGH;
case 2:
RGB101010_RGB332(*dst++, *src);
++src;
+ SDL_FALLTHROUGH;
case 1:
RGB101010_RGB332(*dst++, *src);
++src;
@@ -1153,10 +1159,12 @@ static void Blit_RGB101010_index8(SDL_BlitInfo *info)
RGB101010_RGB332(Pixel, *src);
*dst++ = map[Pixel];
++src;
+ SDL_FALLTHROUGH;
case 2:
RGB101010_RGB332(Pixel, *src);
*dst++ = map[Pixel];
++src;
+ SDL_FALLTHROUGH;
case 1:
RGB101010_RGB332(Pixel, *src);
*dst++ = map[Pixel];
@@ -1248,6 +1256,7 @@ static void Blit_RGB888_RGB555(SDL_BlitInfo *info)
RGB888_RGB555(dst, src);
++src;
++dst;
+ SDL_FALLTHROUGH;
case 2:
RGB888_RGB555_TWO(dst, src);
src += 2;
@@ -1279,6 +1288,7 @@ static void Blit_RGB888_RGB555(SDL_BlitInfo *info)
RGB888_RGB555(dst, src);
++src;
++dst;
+ SDL_FALLTHROUGH;
case 2:
RGB888_RGB555_TWO(dst, src);
src += 2;
@@ -1376,6 +1386,7 @@ static void Blit_RGB888_RGB565(SDL_BlitInfo *info)
RGB888_RGB565(dst, src);
++src;
++dst;
+ SDL_FALLTHROUGH;
case 2:
RGB888_RGB565_TWO(dst, src);
src += 2;
@@ -1407,6 +1418,7 @@ static void Blit_RGB888_RGB565(SDL_BlitInfo *info)
RGB888_RGB565(dst, src);
++src;
++dst;
+ SDL_FALLTHROUGH;
case 2:
RGB888_RGB565_TWO(dst, src);
src += 2;
@@ -1478,9 +1490,11 @@ static void Blit_RGB565_32(SDL_BlitInfo *info, const Uint32 *map)
case 3:
*dst++ = RGB565_32(dst, src, map);
src += 2;
+ SDL_FALLTHROUGH;
case 2:
*dst++ = RGB565_32(dst, src, map);
src += 2;
+ SDL_FALLTHROUGH;
case 1:
*dst++ = RGB565_32(dst, src, map);
src += 2;