mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-04-28 02:04:20 +00:00
Use SDL_bool instead an int return code in the SDL API
Most SDL functions used to indicate success or failure using an int return code. These functions have been changed to return SDL_bool. Here is a coccinelle patch to change code that previously compared the return value to 0 and changes it to a boolean test: @ bool_return_type @ identifier func =~ "^(SDL_AddEventWatch|SDL_AddHintCallback|SDL_AddSurfaceAlternateImage|SDL_AddVulkanRenderSemaphores|SDL_BindAudioStream|SDL_BindAudioStreams|SDL_BlitSurface|SDL_BlitSurface9Grid|SDL_BlitSurfaceScaled|SDL_BlitSurfaceTiled|SDL_BlitSurfaceTiledWithScale|SDL_BlitSurfaceUnchecked|SDL_BlitSurfaceUncheckedScaled|SDL_CaptureMouse|SDL_ClearAudioStream|SDL_ClearClipboardData|SDL_ClearComposition|SDL_ClearError|SDL_ClearProperty|SDL_ClearSurface|SDL_CloseIO|SDL_CloseStorage|SDL_ConvertAudioSamples|SDL_ConvertEventToRenderCoordinates|SDL_ConvertPixels|SDL_ConvertPixelsAndColorspace|SDL_CopyFile|SDL_CopyProperties|SDL_CopyStorageFile|SDL_CreateDirectory|SDL_CreateStorageDirectory|SDL_CreateWindowAndRenderer|SDL_DateTimeToTime|SDL_DestroyWindowSurface|SDL_DetachVirtualJoystick|SDL_DisableScreenSaver|SDL_EnableScreenSaver|SDL_EnumerateDirectory|SDL_EnumerateProperties|SDL_EnumerateStorageDirectory|SDL_FillSurfaceRect|SDL_FillSurfaceRects|SDL_FlashWindow|SDL_FlipSurface|SDL_FlushAudioStream|SDL_FlushRenderer|SDL_GL_DestroyContext|SDL_GL_GetAttribute|SDL_GL_GetSwapInterval|SDL_GL_LoadLibrary|SDL_GL_MakeCurrent|SDL_GL_SetAttribute|SDL_GL_SetSwapInterval|SDL_GL_SwapWindow|SDL_GetAudioDeviceFormat|SDL_GetAudioStreamFormat|SDL_GetCameraFormat|SDL_GetClosestFullscreenDisplayMode|SDL_GetCurrentRenderOutputSize|SDL_GetCurrentTime|SDL_GetDXGIOutputInfo|SDL_GetDateTimeLocalePreferences|SDL_GetDisplayBounds|SDL_GetDisplayUsableBounds|SDL_GetGDKDefaultUser|SDL_GetGDKTaskQueue|SDL_GetGamepadSensorData|SDL_GetGamepadTouchpadFinger|SDL_GetHapticEffectStatus|SDL_GetJoystickBall|SDL_GetMasksForPixelFormat|SDL_GetPathInfo|SDL_GetRectUnion|SDL_GetRectUnionFloat|SDL_GetRenderClipRect|SDL_GetRenderColorScale|SDL_GetRenderDrawBlendMode|SDL_GetRenderDrawColor|SDL_GetRenderDrawColorFloat|SDL_GetRenderLogicalPresentation|SDL_GetRenderLogicalPresentationRect|SDL_GetRenderOutputSize|SDL_GetRenderSafeArea|SDL_GetRenderScale|SDL_GetRenderVSync|SDL_GetRenderViewport|SDL_GetSensorData|SDL_GetStorageFileSize|SDL_GetStoragePathInfo|SDL_GetSurfaceAlphaMod|SDL_GetSurfaceBlendMode|SDL_GetSurfaceClipRect|SDL_GetSurfaceColorKey|SDL_GetSurfaceColorMod|SDL_GetTextInputArea|SDL_GetTextureAlphaMod|SDL_GetTextureAlphaModFloat|SDL_GetTextureBlendMode|SDL_GetTextureColorMod|SDL_GetTextureColorModFloat|SDL_GetTextureScaleMode|SDL_GetTextureSize|SDL_GetWindowAspectRatio|SDL_GetWindowBordersSize|SDL_GetWindowMaximumSize|SDL_GetWindowMinimumSize|SDL_GetWindowPosition|SDL_GetWindowRelativeMouseMode|SDL_GetWindowSafeArea|SDL_GetWindowSize|SDL_GetWindowSizeInPixels|SDL_GetWindowSurfaceVSync|SDL_HideCursor|SDL_HideWindow|SDL_Init|SDL_InitHapticRumble|SDL_InitSubSystem|SDL_LoadWAV|SDL_LoadWAV_IO|SDL_LockAudioStream|SDL_LockProperties|SDL_LockSurface|SDL_LockTexture|SDL_LockTextureToSurface|SDL_MaximizeWindow|SDL_MinimizeWindow|SDL_MixAudio|SDL_OpenURL|SDL_OutOfMemory|SDL_PauseAudioDevice|SDL_PauseAudioStreamDevice|SDL_PauseHaptic|SDL_PlayHapticRumble|SDL_PremultiplyAlpha|SDL_PremultiplySurfaceAlpha|SDL_PushEvent|SDL_PutAudioStreamData|SDL_RaiseWindow|SDL_ReadStorageFile|SDL_ReadSurfacePixel|SDL_ReadSurfacePixelFloat|SDL_RegisterApp|SDL_ReloadGamepadMappings|SDL_RemovePath|SDL_RemoveStoragePath|SDL_RemoveTimer|SDL_RenamePath|SDL_RenameStoragePath|SDL_RenderClear|SDL_RenderCoordinatesFromWindow|SDL_RenderCoordinatesToWindow|SDL_RenderFillRect|SDL_RenderFillRects|SDL_RenderGeometry|SDL_RenderGeometryRaw|SDL_RenderLine|SDL_RenderLines|SDL_RenderPoint|SDL_RenderPoints|SDL_RenderPresent|SDL_RenderRect|SDL_RenderRects|SDL_RenderTexture|SDL_RenderTexture9Grid|SDL_RenderTextureRotated|SDL_RenderTextureTiled|SDL_RequestAndroidPermission|SDL_RestoreWindow|SDL_ResumeAudioDevice|SDL_ResumeAudioStreamDevice|SDL_ResumeHaptic|SDL_RumbleGamepad|SDL_RumbleGamepadTriggers|SDL_RumbleJoystick|SDL_RumbleJoystickTriggers|SDL_RunHapticEffect|SDL_SaveBMP|SDL_SaveBMP_IO|SDL_SendAndroidMessage|SDL_SendGamepadEffect|SDL_SendJoystickEffect|SDL_SendJoystickVirtualSensorData|SDL_SetAppMetadata|SDL_SetAppMetadataProperty|SDL_SetAudioDeviceGain|SDL_SetAudioPostmixCallback|SDL_SetAudioStreamFormat|SDL_SetAudioStreamFrequencyRatio|SDL_SetAudioStreamGain|SDL_SetAudioStreamGetCallback|SDL_SetAudioStreamInputChannelMap|SDL_SetAudioStreamOutputChannelMap|SDL_SetAudioStreamPutCallback|SDL_SetBooleanProperty|SDL_SetClipboardData|SDL_SetClipboardText|SDL_SetCursor|SDL_SetFloatProperty|SDL_SetGamepadLED|SDL_SetGamepadMapping|SDL_SetGamepadPlayerIndex|SDL_SetGamepadSensorEnabled|SDL_SetHapticAutocenter|SDL_SetHapticGain|SDL_SetJoystickLED|SDL_SetJoystickPlayerIndex|SDL_SetJoystickVirtualAxis|SDL_SetJoystickVirtualBall|SDL_SetJoystickVirtualButton|SDL_SetJoystickVirtualHat|SDL_SetJoystickVirtualTouchpad|SDL_SetLinuxThreadPriority|SDL_SetLinuxThreadPriorityAndPolicy|SDL_SetLogPriorityPrefix|SDL_SetMemoryFunctions|SDL_SetNumberProperty|SDL_SetPaletteColors|SDL_SetPointerProperty|SDL_SetPointerPropertyWithCleanup|SDL_SetPrimarySelectionText|SDL_SetRenderClipRect|SDL_SetRenderColorScale|SDL_SetRenderDrawBlendMode|SDL_SetRenderDrawColor|SDL_SetRenderDrawColorFloat|SDL_SetRenderLogicalPresentation|SDL_SetRenderScale|SDL_SetRenderTarget|SDL_SetRenderVSync|SDL_SetRenderViewport|SDL_SetScancodeName|SDL_SetStringProperty|SDL_SetSurfaceAlphaMod|SDL_SetSurfaceBlendMode|SDL_SetSurfaceColorKey|SDL_SetSurfaceColorMod|SDL_SetSurfaceColorspace|SDL_SetSurfacePalette|SDL_SetSurfaceRLE|SDL_SetTLS|SDL_SetTextInputArea|SDL_SetTextureAlphaMod|SDL_SetTextureAlphaModFloat|SDL_SetTextureBlendMode|SDL_SetTextureColorMod|SDL_SetTextureColorModFloat|SDL_SetTextureScaleMode|SDL_SetThreadPriority|SDL_SetWindowAlwaysOnTop|SDL_SetWindowAspectRatio|SDL_SetWindowBordered|SDL_SetWindowFocusable|SDL_SetWindowFullscreen|SDL_SetWindowFullscreenMode|SDL_SetWindowHitTest|SDL_SetWindowIcon|SDL_SetWindowKeyboardGrab|SDL_SetWindowMaximumSize|SDL_SetWindowMinimumSize|SDL_SetWindowModalFor|SDL_SetWindowMouseGrab|SDL_SetWindowMouseRect|SDL_SetWindowOpacity|SDL_SetWindowPosition|SDL_SetWindowRelativeMouseMode|SDL_SetWindowResizable|SDL_SetWindowShape|SDL_SetWindowSize|SDL_SetWindowSurfaceVSync|SDL_SetWindowTitle|SDL_SetiOSAnimationCallback|SDL_ShowAndroidToast|SDL_ShowCursor|SDL_ShowMessageBox|SDL_ShowSimpleMessageBox|SDL_ShowWindow|SDL_ShowWindowSystemMenu|SDL_StartTextInput|SDL_StartTextInputWithProperties|SDL_StopHapticEffect|SDL_StopHapticEffects|SDL_StopHapticRumble|SDL_StopTextInput|SDL_SyncWindow|SDL_TimeToDateTime|SDL_TryLockMutex|SDL_TryLockRWLockForReading|SDL_TryLockRWLockForWriting|SDL_TryWaitSemaphore|SDL_UnlockAudioStream|SDL_UpdateHapticEffect|SDL_UpdateNVTexture|SDL_UpdateTexture|SDL_UpdateWindowSurface|SDL_UpdateWindowSurfaceRects|SDL_UpdateYUVTexture|SDL_Vulkan_CreateSurface|SDL_Vulkan_LoadLibrary|SDL_WaitConditionTimeout|SDL_WaitSemaphoreTimeout|SDL_WarpMouseGlobal|SDL_WriteStorageFile|SDL_WriteSurfacePixel|SDL_WriteSurfacePixelFloat)$"; @@ ( func( ... ) - == 0 | - func( + !func( ... ) - < 0 | - func( + !func( ... ) - != 0 | - func( + !func( ... ) - == -1 )
This commit is contained in:
@@ -57,7 +57,7 @@ Sint64 SDL_CivilToDays(int year, int month, int day, int *day_of_week, int *day_
|
||||
return z;
|
||||
}
|
||||
|
||||
int SDL_GetDateTimeLocalePreferences(SDL_DateFormat *dateFormat, SDL_TimeFormat *timeFormat)
|
||||
SDL_bool SDL_GetDateTimeLocalePreferences(SDL_DateFormat *dateFormat, SDL_TimeFormat *timeFormat)
|
||||
{
|
||||
// Default to ISO 8061 date format, as it is unambiguous, and 24 hour time.
|
||||
if (dateFormat) {
|
||||
@@ -69,7 +69,7 @@ int SDL_GetDateTimeLocalePreferences(SDL_DateFormat *dateFormat, SDL_TimeFormat
|
||||
|
||||
SDL_GetSystemTimeLocalePreferences(dateFormat, timeFormat);
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
int SDL_GetDaysInMonth(int year, int month)
|
||||
@@ -79,7 +79,8 @@ int SDL_GetDaysInMonth(int year, int month)
|
||||
};
|
||||
|
||||
if (month < 1 || month > 12) {
|
||||
return SDL_SetError("Month out of range [1-12], requested: %i", month);
|
||||
SDL_SetError("Month out of range [1-12], requested: %i", month);
|
||||
return -1;
|
||||
}
|
||||
|
||||
int days = DAYS_IN_MONTH[month - 1];
|
||||
@@ -100,10 +101,12 @@ int SDL_GetDayOfYear(int year, int month, int day)
|
||||
int dayOfYear;
|
||||
|
||||
if (month < 1 || month > 12) {
|
||||
return SDL_SetError("Month out of range [1-12], requested: %i", month);
|
||||
SDL_SetError("Month out of range [1-12], requested: %i", month);
|
||||
return -1;
|
||||
}
|
||||
if (day < 1 || day > SDL_GetDaysInMonth(year, month)) {
|
||||
return SDL_SetError("Day out of range [1-%i], requested: %i", SDL_GetDaysInMonth(year, month), month);
|
||||
SDL_SetError("Day out of range [1-%i], requested: %i", SDL_GetDaysInMonth(year, month), month);
|
||||
return -1;
|
||||
}
|
||||
|
||||
SDL_CivilToDays(year, month, day, NULL, &dayOfYear);
|
||||
@@ -115,10 +118,12 @@ int SDL_GetDayOfWeek(int year, int month, int day)
|
||||
int dayOfWeek;
|
||||
|
||||
if (month < 1 || month > 12) {
|
||||
return SDL_SetError("Month out of range [1-12], requested: %i", month);
|
||||
SDL_SetError("Month out of range [1-12], requested: %i", month);
|
||||
return -1;
|
||||
}
|
||||
if (day < 1 || day > SDL_GetDaysInMonth(year, month)) {
|
||||
return SDL_SetError("Day out of range [1-%i], requested: %i", SDL_GetDaysInMonth(year, month), month);
|
||||
SDL_SetError("Day out of range [1-%i], requested: %i", SDL_GetDaysInMonth(year, month), month);
|
||||
return -1;
|
||||
}
|
||||
|
||||
SDL_CivilToDays(year, month, day, &dayOfWeek, NULL);
|
||||
@@ -157,11 +162,11 @@ static bool SDL_DateTimeIsValid(const SDL_DateTime *dt)
|
||||
return true;
|
||||
}
|
||||
|
||||
int SDL_DateTimeToTime(const SDL_DateTime *dt, SDL_Time *ticks)
|
||||
SDL_bool SDL_DateTimeToTime(const SDL_DateTime *dt, SDL_Time *ticks)
|
||||
{
|
||||
static const Sint64 max_seconds = SDL_NS_TO_SECONDS(SDL_MAX_TIME) - 1;
|
||||
static const Sint64 min_seconds = SDL_NS_TO_SECONDS(SDL_MIN_TIME) + 1;
|
||||
int ret = 0;
|
||||
bool result = true;
|
||||
|
||||
if (!dt) {
|
||||
return SDL_InvalidParamError("dt");
|
||||
@@ -171,18 +176,18 @@ int SDL_DateTimeToTime(const SDL_DateTime *dt, SDL_Time *ticks)
|
||||
}
|
||||
if (!SDL_DateTimeIsValid(dt)) {
|
||||
// The validation function sets the error string.
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
|
||||
*ticks = SDL_CivilToDays(dt->year, dt->month, dt->day, NULL, NULL) * SDL_SECONDS_PER_DAY;
|
||||
*ticks += (((dt->hour * 60) + dt->minute) * 60) + dt->second - dt->utc_offset;
|
||||
if (*ticks > max_seconds || *ticks < min_seconds) {
|
||||
*ticks = SDL_clamp(*ticks, min_seconds, max_seconds);
|
||||
ret = SDL_SetError("Date out of range for SDL_Time representation; SDL_Time value clamped");
|
||||
result = SDL_SetError("Date out of range for SDL_Time representation; SDL_Time value clamped");
|
||||
}
|
||||
*ticks = SDL_SECONDS_TO_NS(*ticks) + dt->nanosecond;
|
||||
|
||||
return ret;
|
||||
return result;
|
||||
}
|
||||
|
||||
#define DELTA_EPOCH_1601_100NS (11644473600ll * 10000000ll) // [100 ns] (100 ns units between 1601-01-01 and 1970-01-01, 11644473600 seconds)
|
||||
|
||||
@@ -106,7 +106,7 @@ void SDL_GetSystemTimeLocalePreferences(SDL_DateFormat *df, SDL_TimeFormat *tf)
|
||||
}
|
||||
}
|
||||
|
||||
int SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
SDL_bool SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
{
|
||||
if (!ticks) {
|
||||
return SDL_InvalidParamError("ticks");
|
||||
@@ -118,10 +118,10 @@ int SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
|
||||
*ticks = SDL_MS_TO_NS(ndsTicks - DELTA_EPOCH_1900_OFFSET_MS);
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
int SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
SDL_bool SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
{
|
||||
if (!dt) {
|
||||
return SDL_InvalidParamError("dt");
|
||||
@@ -141,7 +141,7 @@ int SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
|
||||
SDL_CivilToDays(dt->year, dt->month, dt->day, &dt->day_of_week, NULL);
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif // SDL_TIME_N3DS
|
||||
|
||||
@@ -32,7 +32,7 @@ void SDL_GetSystemTimeLocalePreferences(SDL_DateFormat *df, SDL_TimeFormat *tf)
|
||||
{
|
||||
}
|
||||
|
||||
int SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
SDL_bool SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
{
|
||||
if (!ticks) {
|
||||
return SDL_InvalidParamError("ticks");
|
||||
@@ -40,10 +40,10 @@ int SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
|
||||
*ticks = 0;
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
int SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
SDL_bool SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
{
|
||||
if (!dt) {
|
||||
return SDL_InvalidParamError("dt");
|
||||
@@ -59,7 +59,7 @@ int SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
dt->day_of_week = 4;
|
||||
dt->utc_offset = 0;
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif // SDL_TIME_PS2
|
||||
|
||||
@@ -65,7 +65,7 @@ void SDL_GetSystemTimeLocalePreferences(SDL_DateFormat *df, SDL_TimeFormat *tf)
|
||||
}
|
||||
}
|
||||
|
||||
int SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
SDL_bool SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
{
|
||||
u64 sceTicks;
|
||||
|
||||
@@ -87,13 +87,13 @@ int SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
|
||||
*ticks = (SDL_Time)(sceTicks - epoch_offset) * div;
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
return SDL_SetError("Failed to retrieve system time (%i)", ret);
|
||||
}
|
||||
|
||||
int SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
SDL_bool SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
{
|
||||
ScePspDateTime t;
|
||||
u64 local;
|
||||
@@ -127,7 +127,7 @@ int SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
|
||||
SDL_CivilToDays(dt->year, dt->month, dt->day, &dt->day_of_week, NULL);
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -98,7 +98,7 @@ found_date:
|
||||
#endif
|
||||
}
|
||||
|
||||
int SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
SDL_bool SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
{
|
||||
if (!ticks) {
|
||||
return SDL_InvalidParamError("ticks");
|
||||
@@ -109,7 +109,7 @@ int SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
if (clock_gettime(CLOCK_REALTIME, &tp) == 0) {
|
||||
//tp.tv_sec = SDL_min(tp.tv_sec, SDL_NS_TO_SECONDS(SDL_MAX_TIME) - 1);
|
||||
*ticks = SDL_SECONDS_TO_NS(tp.tv_sec) + tp.tv_nsec;
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
SDL_SetError("Failed to retrieve system time (%i)", errno);
|
||||
@@ -129,7 +129,7 @@ int SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
mach_port_deallocate(mach_task_self(), cclock);
|
||||
|
||||
if (!ret) {
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,16 +141,16 @@ int SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
if (gettimeofday(&tv, NULL) == 0) {
|
||||
tv.tv_sec = SDL_min(tv.tv_sec, SDL_NS_TO_SECONDS(SDL_MAX_TIME) - 1);
|
||||
*ticks = SDL_SECONDS_TO_NS(tv.tv_sec) + SDL_US_TO_NS(tv.tv_usec);
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
SDL_SetError("Failed to retrieve system time (%i)", errno);
|
||||
#endif
|
||||
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
|
||||
int SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
SDL_bool SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
{
|
||||
#if defined (HAVE_GMTIME_R) || defined(HAVE_LOCALTIME_R)
|
||||
struct tm tm_storage;
|
||||
@@ -188,7 +188,7 @@ int SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
dt->day_of_week = tm->tm_wday;
|
||||
dt->utc_offset = (int)tm->tm_gmtoff;
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
return SDL_SetError("SDL_DateTime conversion failed (%i)", errno);
|
||||
|
||||
@@ -71,7 +71,7 @@ void SDL_GetSystemTimeLocalePreferences(SDL_DateFormat *df, SDL_TimeFormat *tf)
|
||||
sceAppUtilShutdown();
|
||||
}
|
||||
|
||||
int SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
SDL_bool SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
{
|
||||
SceRtcTick sceTicks;
|
||||
|
||||
@@ -92,13 +92,13 @@ int SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
sceTicks.tick = SDL_clamp(sceTicks.tick, scetime_min, scetime_max);
|
||||
*ticks = (SDL_Time)(sceTicks.tick - epoch_offset) * div;
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
return SDL_SetError("Failed to retrieve system time (%i)", ret);
|
||||
}
|
||||
|
||||
int SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
SDL_bool SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
{
|
||||
SceDateTime t;
|
||||
SceRtcTick sceTicks, sceLocalTicks;
|
||||
@@ -132,7 +132,7 @@ int SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
|
||||
SDL_CivilToDays(dt->year, dt->month, dt->day, &dt->day_of_week, NULL);
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -75,7 +75,7 @@ found_date:
|
||||
}
|
||||
}
|
||||
|
||||
int SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
SDL_bool SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
{
|
||||
FILETIME ft;
|
||||
|
||||
@@ -109,10 +109,10 @@ int SDL_GetCurrentTime(SDL_Time *ticks)
|
||||
|
||||
*ticks = SDL_TimeFromWindows(ft.dwLowDateTime, ft.dwHighDateTime);
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
int SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
SDL_bool SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
{
|
||||
FILETIME ft, local_ft;
|
||||
SYSTEMTIME utc_st, local_st;
|
||||
@@ -151,7 +151,7 @@ int SDL_TimeToDateTime(SDL_Time ticks, SDL_DateTime *dt, SDL_bool localTime)
|
||||
dt->nanosecond = ticks % SDL_NS_PER_SECOND;
|
||||
dt->day_of_week = st->wDayOfWeek;
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user