encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-05-19 05:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

SDL_hidapijoystick.c: worked around a bogus 'unreachable code' warning.

Browse Source
This commit is contained in:
Ozkan Sezer 2021-11-13 11:50:02 +03:00
parent eb3f1462b8
commit a948ff8494
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/joystick/hidapi/SDL_hidapijoystick.c
View File

@ -201,8 +201,7 @@ static void
HIDAPI_SetupDeviceDriver(SDL_HIDAPI_Device *device) HIDAPI_SetupDeviceDriver(SDL_HIDAPI_Device *device)
{ {
if (device->driver) { if (device->driver) {
/* Already setup */ return; /* Already setup */
return;
} }
device->driver = HIDAPI_GetDeviceDriver(device); device->driver = HIDAPI_GetDeviceDriver(device);
@ -224,8 +223,7 @@ static void
HIDAPI_CleanupDeviceDriver(SDL_HIDAPI_Device *device) HIDAPI_CleanupDeviceDriver(SDL_HIDAPI_Device *device)
{ {
if (!device->driver) { if (!device->driver) {
/* Already cleaned up */ return; /* Already cleaned up */
return;
} }
/* Disconnect any joysticks */ /* Disconnect any joysticks */
@ -395,10 +393,13 @@ HIDAPI_ConvertString(const wchar_t *wide_string)
if (wide_string) { if (wide_string) {
string = SDL_iconv_string("UTF-8", "WCHAR_T", (char*)wide_string, (SDL_wcslen(wide_string)+1)*sizeof(wchar_t)); string = SDL_iconv_string("UTF-8", "WCHAR_T", (char*)wide_string, (SDL_wcslen(wide_string)+1)*sizeof(wchar_t));
if (!string) { if (!string) {
if (sizeof(wchar_t) == sizeof(Uint16)) { switch (sizeof(wchar_t)) {
case 2:
string = SDL_iconv_string("UTF-8", "UCS-2-INTERNAL", (char*)wide_string, (SDL_wcslen(wide_string)+1)*sizeof(wchar_t)); string = SDL_iconv_string("UTF-8", "UCS-2-INTERNAL", (char*)wide_string, (SDL_wcslen(wide_string)+1)*sizeof(wchar_t));
} else if (sizeof(wchar_t) == sizeof(Uint32)) { break;
case 4:
string = SDL_iconv_string("UTF-8", "UCS-4-INTERNAL", (char*)wide_string, (SDL_wcslen(wide_string)+1)*sizeof(wchar_t)); string = SDL_iconv_string("UTF-8", "UCS-4-INTERNAL", (char*)wide_string, (SDL_wcslen(wide_string)+1)*sizeof(wchar_t));
break;
} }
} }
} }