mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-04-26 01:04:17 +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:
Sam Lantinga
@@ -50,10 +50,10 @@ struct SDL_Storage
|
||||
return SDL_SetError("Invalid storage container"); \
|
||||
}
|
||||
|
||||
#define CHECK_STORAGE_MAGIC_RET(retval) \
|
||||
#define CHECK_STORAGE_MAGIC_RET(result) \
|
||||
if (!storage) { \
|
||||
SDL_SetError("Invalid storage container"); \
|
||||
return retval; \
|
||||
return result; \
|
||||
}
|
||||
|
||||
SDL_Storage *SDL_OpenTitleStorage(const char *override, SDL_PropertiesID props)
|
||||
@@ -162,17 +162,17 @@ SDL_Storage *SDL_OpenStorage(const SDL_StorageInterface *iface, void *userdata)
|
||||
return storage;
|
||||
}
|
||||
|
||||
int SDL_CloseStorage(SDL_Storage *storage)
|
||||
SDL_bool SDL_CloseStorage(SDL_Storage *storage)
|
||||
{
|
||||
int retval = 0;
|
||||
bool result = true;
|
||||
|
||||
CHECK_STORAGE_MAGIC()
|
||||
|
||||
if (storage->iface.close) {
|
||||
retval = storage->iface.close(storage->userdata);
|
||||
result = storage->iface.close(storage->userdata);
|
||||
}
|
||||
SDL_free(storage);
|
||||
return retval;
|
||||
return result;
|
||||
}
|
||||
|
||||
SDL_bool SDL_StorageReady(SDL_Storage *storage)
|
||||
@@ -185,20 +185,24 @@ SDL_bool SDL_StorageReady(SDL_Storage *storage)
|
||||
return true;
|
||||
}
|
||||
|
||||
int SDL_GetStorageFileSize(SDL_Storage *storage, const char *path, Uint64 *length)
|
||||
SDL_bool SDL_GetStorageFileSize(SDL_Storage *storage, const char *path, Uint64 *length)
|
||||
{
|
||||
SDL_PathInfo info;
|
||||
|
||||
if (SDL_GetStoragePathInfo(storage, path, &info) < 0) {
|
||||
return -1;
|
||||
if (SDL_GetStoragePathInfo(storage, path, &info)) {
|
||||
if (length) {
|
||||
*length = info.size;
|
||||
}
|
||||
return true;
|
||||
} else {
|
||||
if (length) {
|
||||
*length = 0;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
if (length) {
|
||||
*length = info.size;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int SDL_ReadStorageFile(SDL_Storage *storage, const char *path, void *destination, Uint64 length)
|
||||
SDL_bool SDL_ReadStorageFile(SDL_Storage *storage, const char *path, void *destination, Uint64 length)
|
||||
{
|
||||
CHECK_STORAGE_MAGIC()
|
||||
|
||||
@@ -213,7 +217,7 @@ int SDL_ReadStorageFile(SDL_Storage *storage, const char *path, void *destinatio
|
||||
return storage->iface.read_file(storage->userdata, path, destination, length);
|
||||
}
|
||||
|
||||
int SDL_WriteStorageFile(SDL_Storage *storage, const char *path, const void *source, Uint64 length)
|
||||
SDL_bool SDL_WriteStorageFile(SDL_Storage *storage, const char *path, const void *source, Uint64 length)
|
||||
{
|
||||
CHECK_STORAGE_MAGIC()
|
||||
|
||||
@@ -228,7 +232,7 @@ int SDL_WriteStorageFile(SDL_Storage *storage, const char *path, const void *sou
|
||||
return storage->iface.write_file(storage->userdata, path, source, length);
|
||||
}
|
||||
|
||||
int SDL_CreateStorageDirectory(SDL_Storage *storage, const char *path)
|
||||
SDL_bool SDL_CreateStorageDirectory(SDL_Storage *storage, const char *path)
|
||||
{
|
||||
CHECK_STORAGE_MAGIC()
|
||||
|
||||
@@ -243,7 +247,7 @@ int SDL_CreateStorageDirectory(SDL_Storage *storage, const char *path)
|
||||
return storage->iface.mkdir(storage->userdata, path);
|
||||
}
|
||||
|
||||
int SDL_EnumerateStorageDirectory(SDL_Storage *storage, const char *path, SDL_EnumerateDirectoryCallback callback, void *userdata)
|
||||
SDL_bool SDL_EnumerateStorageDirectory(SDL_Storage *storage, const char *path, SDL_EnumerateDirectoryCallback callback, void *userdata)
|
||||
{
|
||||
CHECK_STORAGE_MAGIC()
|
||||
|
||||
@@ -258,7 +262,7 @@ int SDL_EnumerateStorageDirectory(SDL_Storage *storage, const char *path, SDL_En
|
||||
return storage->iface.enumerate(storage->userdata, path, callback, userdata);
|
||||
}
|
||||
|
||||
int SDL_RemoveStoragePath(SDL_Storage *storage, const char *path)
|
||||
SDL_bool SDL_RemoveStoragePath(SDL_Storage *storage, const char *path)
|
||||
{
|
||||
CHECK_STORAGE_MAGIC()
|
||||
|
||||
@@ -273,7 +277,7 @@ int SDL_RemoveStoragePath(SDL_Storage *storage, const char *path)
|
||||
return storage->iface.remove(storage->userdata, path);
|
||||
}
|
||||
|
||||
int SDL_RenameStoragePath(SDL_Storage *storage, const char *oldpath, const char *newpath)
|
||||
SDL_bool SDL_RenameStoragePath(SDL_Storage *storage, const char *oldpath, const char *newpath)
|
||||
{
|
||||
CHECK_STORAGE_MAGIC()
|
||||
|
||||
@@ -291,7 +295,7 @@ int SDL_RenameStoragePath(SDL_Storage *storage, const char *oldpath, const char
|
||||
return storage->iface.rename(storage->userdata, oldpath, newpath);
|
||||
}
|
||||
|
||||
int SDL_CopyStorageFile(SDL_Storage *storage, const char *oldpath, const char *newpath)
|
||||
SDL_bool SDL_CopyStorageFile(SDL_Storage *storage, const char *oldpath, const char *newpath)
|
||||
{
|
||||
CHECK_STORAGE_MAGIC()
|
||||
|
||||
@@ -309,7 +313,7 @@ int SDL_CopyStorageFile(SDL_Storage *storage, const char *oldpath, const char *n
|
||||
return storage->iface.copy(storage->userdata, oldpath, newpath);
|
||||
}
|
||||
|
||||
int SDL_GetStoragePathInfo(SDL_Storage *storage, const char *path, SDL_PathInfo *info)
|
||||
SDL_bool SDL_GetStoragePathInfo(SDL_Storage *storage, const char *path, SDL_PathInfo *info)
|
||||
{
|
||||
SDL_PathInfo dummy;
|
||||
|
||||
@@ -343,12 +347,12 @@ Uint64 SDL_GetStorageSpaceRemaining(SDL_Storage *storage)
|
||||
return storage->iface.space_remaining(storage->userdata);
|
||||
}
|
||||
|
||||
static int GlobStorageDirectoryGetPathInfo(const char *path, SDL_PathInfo *info, void *userdata)
|
||||
static SDL_bool GlobStorageDirectoryGetPathInfo(const char *path, SDL_PathInfo *info, void *userdata)
|
||||
{
|
||||
return SDL_GetStoragePathInfo((SDL_Storage *) userdata, path, info);
|
||||
}
|
||||
|
||||
static int GlobStorageDirectoryEnumerator(const char *path, SDL_EnumerateDirectoryCallback cb, void *cbuserdata, void *userdata)
|
||||
static SDL_bool GlobStorageDirectoryEnumerator(const char *path, SDL_EnumerateDirectoryCallback cb, void *cbuserdata, void *userdata)
|
||||
{
|
||||
return SDL_EnumerateStorageDirectory((SDL_Storage *) userdata, path, cb, cbuserdata);
|
||||
}
|
||||
|
||||
@@ -38,15 +38,15 @@ static char *GENERIC_INTERNAL_CreateFullPath(const char *base, const char *relat
|
||||
return result;
|
||||
}
|
||||
|
||||
static int GENERIC_CloseStorage(void *userdata)
|
||||
static SDL_bool GENERIC_CloseStorage(void *userdata)
|
||||
{
|
||||
SDL_free(userdata);
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static int GENERIC_EnumerateStorageDirectory(void *userdata, const char *path, SDL_EnumerateDirectoryCallback callback, void *callback_userdata)
|
||||
static SDL_bool GENERIC_EnumerateStorageDirectory(void *userdata, const char *path, SDL_EnumerateDirectoryCallback callback, void *callback_userdata)
|
||||
{
|
||||
int result = -1;
|
||||
bool result = false;
|
||||
|
||||
char *fullpath = GENERIC_INTERNAL_CreateFullPath((char *)userdata, path);
|
||||
if (fullpath) {
|
||||
@@ -57,9 +57,9 @@ static int GENERIC_EnumerateStorageDirectory(void *userdata, const char *path, S
|
||||
return result;
|
||||
}
|
||||
|
||||
static int GENERIC_GetStoragePathInfo(void *userdata, const char *path, SDL_PathInfo *info)
|
||||
static SDL_bool GENERIC_GetStoragePathInfo(void *userdata, const char *path, SDL_PathInfo *info)
|
||||
{
|
||||
int result = -1;
|
||||
bool result = false;
|
||||
|
||||
char *fullpath = GENERIC_INTERNAL_CreateFullPath((char *)userdata, path);
|
||||
if (fullpath) {
|
||||
@@ -70,9 +70,9 @@ static int GENERIC_GetStoragePathInfo(void *userdata, const char *path, SDL_Path
|
||||
return result;
|
||||
}
|
||||
|
||||
static int GENERIC_ReadStorageFile(void *userdata, const char *path, void *destination, Uint64 length)
|
||||
static SDL_bool GENERIC_ReadStorageFile(void *userdata, const char *path, void *destination, Uint64 length)
|
||||
{
|
||||
int result = -1;
|
||||
bool result = false;
|
||||
|
||||
if (length > SDL_SIZE_MAX) {
|
||||
return SDL_SetError("Read size exceeds SDL_SIZE_MAX");
|
||||
@@ -84,7 +84,7 @@ static int GENERIC_ReadStorageFile(void *userdata, const char *path, void *desti
|
||||
if (stream) {
|
||||
// FIXME: Should SDL_ReadIO use u64 now...?
|
||||
if (SDL_ReadIO(stream, destination, (size_t)length) == length) {
|
||||
result = 0;
|
||||
result = true;
|
||||
}
|
||||
SDL_CloseIO(stream);
|
||||
}
|
||||
@@ -93,10 +93,10 @@ static int GENERIC_ReadStorageFile(void *userdata, const char *path, void *desti
|
||||
return result;
|
||||
}
|
||||
|
||||
static int GENERIC_WriteStorageFile(void *userdata, const char *path, const void *source, Uint64 length)
|
||||
static SDL_bool GENERIC_WriteStorageFile(void *userdata, const char *path, const void *source, Uint64 length)
|
||||
{
|
||||
// TODO: Recursively create subdirectories with SDL_CreateDirectory
|
||||
int result = -1;
|
||||
bool result = false;
|
||||
|
||||
if (length > SDL_SIZE_MAX) {
|
||||
return SDL_SetError("Write size exceeds SDL_SIZE_MAX");
|
||||
@@ -109,7 +109,7 @@ static int GENERIC_WriteStorageFile(void *userdata, const char *path, const void
|
||||
if (stream) {
|
||||
// FIXME: Should SDL_WriteIO use u64 now...?
|
||||
if (SDL_WriteIO(stream, source, (size_t)length) == length) {
|
||||
result = 0;
|
||||
result = true;
|
||||
}
|
||||
SDL_CloseIO(stream);
|
||||
}
|
||||
@@ -118,10 +118,10 @@ static int GENERIC_WriteStorageFile(void *userdata, const char *path, const void
|
||||
return result;
|
||||
}
|
||||
|
||||
static int GENERIC_CreateStorageDirectory(void *userdata, const char *path)
|
||||
static SDL_bool GENERIC_CreateStorageDirectory(void *userdata, const char *path)
|
||||
{
|
||||
// TODO: Recursively create subdirectories with SDL_CreateDirectory
|
||||
int result = -1;
|
||||
bool result = false;
|
||||
|
||||
char *fullpath = GENERIC_INTERNAL_CreateFullPath((char *)userdata, path);
|
||||
if (fullpath) {
|
||||
@@ -132,9 +132,9 @@ static int GENERIC_CreateStorageDirectory(void *userdata, const char *path)
|
||||
return result;
|
||||
}
|
||||
|
||||
static int GENERIC_RemoveStoragePath(void *userdata, const char *path)
|
||||
static SDL_bool GENERIC_RemoveStoragePath(void *userdata, const char *path)
|
||||
{
|
||||
int result = -1;
|
||||
bool result = false;
|
||||
|
||||
char *fullpath = GENERIC_INTERNAL_CreateFullPath((char *)userdata, path);
|
||||
if (fullpath) {
|
||||
@@ -145,9 +145,9 @@ static int GENERIC_RemoveStoragePath(void *userdata, const char *path)
|
||||
return result;
|
||||
}
|
||||
|
||||
static int GENERIC_RenameStoragePath(void *userdata, const char *oldpath, const char *newpath)
|
||||
static SDL_bool GENERIC_RenameStoragePath(void *userdata, const char *oldpath, const char *newpath)
|
||||
{
|
||||
int result = -1;
|
||||
bool result = false;
|
||||
|
||||
char *fulloldpath = GENERIC_INTERNAL_CreateFullPath((char *)userdata, oldpath);
|
||||
char *fullnewpath = GENERIC_INTERNAL_CreateFullPath((char *)userdata, newpath);
|
||||
@@ -160,9 +160,9 @@ static int GENERIC_RenameStoragePath(void *userdata, const char *oldpath, const
|
||||
return result;
|
||||
}
|
||||
|
||||
static int GENERIC_CopyStorageFile(void *userdata, const char *oldpath, const char *newpath)
|
||||
static SDL_bool GENERIC_CopyStorageFile(void *userdata, const char *oldpath, const char *newpath)
|
||||
{
|
||||
int result = -1;
|
||||
bool result = false;
|
||||
|
||||
char *fulloldpath = GENERIC_INTERNAL_CreateFullPath((char *)userdata, oldpath);
|
||||
char *fullnewpath = GENERIC_INTERNAL_CreateFullPath((char *)userdata, newpath);
|
||||
|
||||
@@ -40,9 +40,9 @@ typedef struct STEAM_RemoteStorage
|
||||
#include "SDL_steamstorage_proc.h"
|
||||
} STEAM_RemoteStorage;
|
||||
|
||||
static int STEAM_CloseStorage(void *userdata)
|
||||
static SDL_bool STEAM_CloseStorage(void *userdata)
|
||||
{
|
||||
int result = 0;
|
||||
bool result = true;
|
||||
STEAM_RemoteStorage *steam = (STEAM_RemoteStorage*) userdata;
|
||||
void *steamremotestorage = steam->SteamAPI_SteamRemoteStorage_v016();
|
||||
if (steamremotestorage == NULL) {
|
||||
@@ -60,7 +60,7 @@ static SDL_bool STEAM_StorageReady(void *userdata)
|
||||
return true;
|
||||
}
|
||||
|
||||
static int STEAM_GetStoragePathInfo(void *userdata, const char *path, SDL_PathInfo *info)
|
||||
static SDL_bool STEAM_GetStoragePathInfo(void *userdata, const char *path, SDL_PathInfo *info)
|
||||
{
|
||||
STEAM_RemoteStorage *steam = (STEAM_RemoteStorage*) userdata;
|
||||
void *steamremotestorage = steam->SteamAPI_SteamRemoteStorage_v016();
|
||||
@@ -73,12 +73,12 @@ static int STEAM_GetStoragePathInfo(void *userdata, const char *path, SDL_PathIn
|
||||
info->type = SDL_PATHTYPE_FILE;
|
||||
info->size = steam->SteamAPI_ISteamRemoteStorage_GetFileSize(steamremotestorage, path);
|
||||
}
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static int STEAM_ReadStorageFile(void *userdata, const char *path, void *destination, Uint64 length)
|
||||
static SDL_bool STEAM_ReadStorageFile(void *userdata, const char *path, void *destination, Uint64 length)
|
||||
{
|
||||
int result = -1;
|
||||
bool result = false;
|
||||
STEAM_RemoteStorage *steam = (STEAM_RemoteStorage*) userdata;
|
||||
void *steamremotestorage = steam->SteamAPI_SteamRemoteStorage_v016();
|
||||
if (steamremotestorage == NULL) {
|
||||
@@ -88,16 +88,16 @@ static int STEAM_ReadStorageFile(void *userdata, const char *path, void *destina
|
||||
return SDL_SetError("SteamRemoteStorage only supports INT32_MAX read size");
|
||||
}
|
||||
if (steam->SteamAPI_ISteamRemoteStorage_FileRead(steamremotestorage, path, destination, (Sint32) length) == length) {
|
||||
result = 0;
|
||||
result = true;
|
||||
} else {
|
||||
SDL_SetError("SteamAPI_ISteamRemoteStorage_FileRead() failed");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static int STEAM_WriteStorageFile(void *userdata, const char *path, const void *source, Uint64 length)
|
||||
static SDL_bool STEAM_WriteStorageFile(void *userdata, const char *path, const void *source, Uint64 length)
|
||||
{
|
||||
int result = -1;
|
||||
int result = false;
|
||||
STEAM_RemoteStorage *steam = (STEAM_RemoteStorage*) userdata;
|
||||
void *steamremotestorage = steam->SteamAPI_SteamRemoteStorage_v016();
|
||||
if (steamremotestorage == NULL) {
|
||||
@@ -107,7 +107,7 @@ static int STEAM_WriteStorageFile(void *userdata, const char *path, const void *
|
||||
return SDL_SetError("SteamRemoteStorage only supports INT32_MAX write size");
|
||||
}
|
||||
if (steam->SteamAPI_ISteamRemoteStorage_FileWrite(steamremotestorage, path, source, (Sint32) length) == length) {
|
||||
result = 0;
|
||||
result = true;
|
||||
} else {
|
||||
SDL_SetError("SteamAPI_ISteamRemoteStorage_FileRead() failed");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user