mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-05 09:26:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed warnings

Browse Source
This commit is contained in:
Sam Lantinga
2023-01-03 15:59:35 -08:00
parent 95e5417d2e
commit 32c077216c
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/events/SDL_mouse.c
View File

@@ -508,7 +508,7 @@ static int SDL_PrivateSendMouseMotion(Uint64 timestamp, SDL_Window *window, SDL_
mouse->x = x; mouse->x = x;
mouse->y = y; mouse->y = y;
mouse->has_position = SDL_TRUE; mouse->has_position = SDL_TRUE;
} else if (!xrel && !yrel) { /* Drop events that don't change state */ } else if (xrel == 0.0f && yrel == 0.0f) { /* Drop events that don't change state */
#ifdef DEBUG_MOUSE #ifdef DEBUG_MOUSE
SDL_Log("Mouse event didn't change state - dropped!\n"); SDL_Log("Mouse event didn't change state - dropped!\n");
#endif #endif

4
src/file/SDL_rwops.c
View File

@@ -375,7 +375,7 @@ stdio_read(SDL_RWops *context, void *ptr, Sint64 size)
{ {
size_t nread; size_t nread;
nread = fread(ptr, 1, size, (FILE *)context->hidden.stdio.fp); nread = fread(ptr, 1, (size_t)size, (FILE *)context->hidden.stdio.fp);
if (nread == 0 && ferror((FILE *)context->hidden.stdio.fp)) { if (nread == 0 && ferror((FILE *)context->hidden.stdio.fp)) {
return SDL_Error(SDL_EFREAD); return SDL_Error(SDL_EFREAD);
} }
@@ -387,7 +387,7 @@ stdio_write(SDL_RWops *context, const void *ptr, Sint64 size)
{ {
size_t nwrote; size_t nwrote;
nwrote = fwrite(ptr, 1, size, (FILE *)context->hidden.stdio.fp); nwrote = fwrite(ptr, 1, (size_t)size, (FILE *)context->hidden.stdio.fp);
if (nwrote == 0 && ferror((FILE *)context->hidden.stdio.fp)) { if (nwrote == 0 && ferror((FILE *)context->hidden.stdio.fp)) {
return SDL_Error(SDL_EFWRITE); return SDL_Error(SDL_EFWRITE);
} }

2
src/joystick/hidapi/SDL_hidapi_xboxone.c
View File

@@ -700,7 +700,7 @@ static void HIDAPI_DriverXboxOne_HandleStatePacket(SDL_Joystick *joystick, SDL_D
} }
} else if (size == 64) { } else if (size == 64) {
if (ctx->last_state[46] != data[46]) { if (ctx->last_state[46] != data[46]) {
SDL_PrivateJoystickButton(joystick, SDL_GAMEPAD_BUTTON_MISC1, (data[46] & 0x01) ? SDL_PRESSED : SDL_RELEASED); SDL_SendJoystickButton(joystick, SDL_GAMEPAD_BUTTON_MISC1, (data[46] & 0x01) ? SDL_PRESSED : SDL_RELEASED);
} }
} }
} }

4
src/timer/unix/SDL_systimer.c
View File

@@ -158,8 +158,8 @@ void SDL_DelayNS(Uint64 ns)
/* Set the timeout interval */ /* Set the timeout interval */
#if HAVE_NANOSLEEP #if HAVE_NANOSLEEP
remaining.tv_sec = (ns / SDL_NS_PER_SECOND); remaining.tv_sec = (time_t)(ns / SDL_NS_PER_SECOND);
remaining.tv_nsec = (ns % SDL_NS_PER_SECOND); remaining.tv_nsec = (long)(ns % SDL_NS_PER_SECOND);
#else #else
then = SDL_GetTicksNS(); then = SDL_GetTicksNS();
#endif #endif

6
src/video/SDL_video.c
View File

@@ -922,7 +922,7 @@ static SDL_DisplayMode *SDL_GetClosestDisplayModeForDisplay(SDL_VideoDisplay *di
} }
/* Default to the desktop refresh rate */ /* Default to the desktop refresh rate */
if (mode->refresh_rate) { if (mode->refresh_rate > 0.0f) {
target_refresh_rate = mode->refresh_rate; target_refresh_rate = mode->refresh_rate;
} else { } else {
target_refresh_rate = display->desktop_mode.refresh_rate; target_refresh_rate = display->desktop_mode.refresh_rate;
@@ -981,7 +981,7 @@ static SDL_DisplayMode *SDL_GetClosestDisplayModeForDisplay(SDL_VideoDisplay *di
closest->w = mode->w; closest->w = mode->w;
closest->h = mode->h; closest->h = mode->h;
} }
if (match->refresh_rate) { if (match->refresh_rate > 0.0f) {
closest->refresh_rate = match->refresh_rate; closest->refresh_rate = match->refresh_rate;
} else { } else {
closest->refresh_rate = mode->refresh_rate; closest->refresh_rate = mode->refresh_rate;
@@ -1043,7 +1043,7 @@ static int SDL_SetDisplayModeForDisplay(SDL_VideoDisplay *display, const SDL_Dis
if (!display_mode.h) { if (!display_mode.h) {
display_mode.h = display->current_mode.h; display_mode.h = display->current_mode.h;
} }
if (!display_mode.refresh_rate) { if (display_mode.refresh_rate == 0.0f) {
display_mode.refresh_rate = display->current_mode.refresh_rate; display_mode.refresh_rate = display->current_mode.refresh_rate;
} }