From 60d3965ece87308ed00719bbc8e181ef309a64ba Mon Sep 17 00:00:00 2001
From: Sylvain Becker <sylvain.becker@gmail.com>
Date: Wed, 30 Oct 2019 15:36:17 +0100
Subject: [PATCH] Readability: remove redundant return, continue, enum
 declaration

---
 src/audio/alsa/SDL_alsa_audio.c         | 1 -
 src/joystick/SDL_gamecontroller.c       | 2 +-
 src/render/opengl/SDL_render_gl.c       | 2 +-
 src/render/opengles2/SDL_render_gles2.c | 2 +-
 src/video/SDL_blit_N.c                  | 3 ---
 src/video/wayland/SDL_waylandtouch.c    | 1 -
 6 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/audio/alsa/SDL_alsa_audio.c b/src/audio/alsa/SDL_alsa_audio.c
index fba8d009b0583..5eae5c2df0253 100644
--- a/src/audio/alsa/SDL_alsa_audio.c
+++ b/src/audio/alsa/SDL_alsa_audio.c
@@ -340,7 +340,6 @@ swizzle_alsa_channels(_THIS, void *buffer, Uint32 bufferlen)
 static void
 no_swizzle(_THIS, void *buffer, Uint32 bufferlen)
 {
-    return;
 }
 #endif /* SND_CHMAP_API_VERSION */
 
diff --git a/src/joystick/SDL_gamecontroller.c b/src/joystick/SDL_gamecontroller.c
index a974bd48e4b72..012a459679b32 100644
--- a/src/joystick/SDL_gamecontroller.c
+++ b/src/joystick/SDL_gamecontroller.c
@@ -881,7 +881,7 @@ SDL_PrivateAddMappingForGUID(SDL_JoystickGUID jGUID, const char *mappingString,
             for ( pPrevMapping = s_pSupportedControllers, pCurrMapping = pPrevMapping->next;
                   pCurrMapping; 
                   pPrevMapping = pCurrMapping, pCurrMapping = pCurrMapping->next ) {
-                continue;
+                /* continue; */
             }
             pPrevMapping->next = pControllerMapping;
         } else {
diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c
index 06f69b444648a..ed6da08540ea9 100644
--- a/src/render/opengl/SDL_render_gl.c
+++ b/src/render/opengl/SDL_render_gl.c
@@ -180,7 +180,7 @@ GL_ClearErrors(SDL_Renderer *renderer)
         }
     } else if (data->glGetError != NULL) {
         while (data->glGetError() != GL_NO_ERROR) {
-            continue;
+            /* continue; */
         }
     }
 }
diff --git a/src/render/opengles2/SDL_render_gles2.c b/src/render/opengles2/SDL_render_gles2.c
index e035c1f97d0ac..e7425e4e355d8 100644
--- a/src/render/opengles2/SDL_render_gles2.c
+++ b/src/render/opengles2/SDL_render_gles2.c
@@ -208,7 +208,7 @@ GL_ClearErrors(SDL_Renderer *renderer)
         return;
     }
     while (data->glGetError() != GL_NO_ERROR) {
-        continue;
+        /* continue; */
     }
 }
 
diff --git a/src/video/SDL_blit_N.c b/src/video/SDL_blit_N.c
index 9313ee69feb48..8950e36668706 100644
--- a/src/video/SDL_blit_N.c
+++ b/src/video/SDL_blit_N.c
@@ -2317,7 +2317,6 @@ get_permutation(SDL_PixelFormat *srcfmt, SDL_PixelFormat *dstfmt,
     if (_alpha_channel) {
         *_alpha_channel = alpha_channel;
     }
-    return;
 }
 
 
@@ -3109,7 +3108,6 @@ Blit_3or4_to_3or4__same_rgb(SDL_BlitInfo * info)
             dst += dstskip;
         }
     }
-    return;
 }
 
 /* Blit_3or4_to_3or4__inversed_rgb: 3 or 4 bpp, inversed RGB triplet */
@@ -3214,7 +3212,6 @@ Blit_3or4_to_3or4__inversed_rgb(SDL_BlitInfo * info)
             dst += dstskip;
         }
     }
-    return;
 }
 
 /* Normal N to N optimized blitters */
diff --git a/src/video/wayland/SDL_waylandtouch.c b/src/video/wayland/SDL_waylandtouch.c
index 16d911e282c3f..ba913ef442e34 100644
--- a/src/video/wayland/SDL_waylandtouch.c
+++ b/src/video/wayland/SDL_waylandtouch.c
@@ -192,7 +192,6 @@ WL_EXPORT const struct wl_interface qt_windowmanager_interface = {
 /* wayland-qt-windowmanager.c ENDS */
 
 /* wayland-qt-surface-extension.c BEGINS */
-extern const struct wl_interface qt_extended_surface_interface;
 #ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
 extern const struct wl_interface wl_surface_interface;
 #endif