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
2024-08-22 17:33:49 -07:00
parent d9a5ed75b9
commit 9ff3446f03
726 changed files with 11062 additions and 11472 deletions

View File

@@ -31,14 +31,14 @@ static char *inhibit_handle = NULL;
static unsigned int screensaver_cookie = 0;
static SDL_DBusContext dbus;
static int LoadDBUSSyms(void)
static bool LoadDBUSSyms(void)
{
#define SDL_DBUS_SYM2_OPTIONAL(TYPE, x, y) \
dbus.x = (TYPE)SDL_LoadFunction(dbus_handle, #y)
#define SDL_DBUS_SYM2(TYPE, x, y) \
if (!(dbus.x = (TYPE)SDL_LoadFunction(dbus_handle, #y))) \
return -1
return false
#define SDL_DBUS_SYM_OPTIONAL(TYPE, x) \
SDL_DBUS_SYM2_OPTIONAL(TYPE, x, dbus_##x)
@@ -93,7 +93,7 @@ static int LoadDBUSSyms(void)
#undef SDL_DBUS_SYM
#undef SDL_DBUS_SYM2
return 0;
return true;
}
static void UnloadDBUSLibrary(void)
@@ -104,23 +104,22 @@ static void UnloadDBUSLibrary(void)
}
}
static int LoadDBUSLibrary(void)
static bool LoadDBUSLibrary(void)
{
int retval = 0;
bool result = true;
if (!dbus_handle) {
dbus_handle = SDL_LoadObject(dbus_library);
if (!dbus_handle) {
retval = -1;
result = false;
// Don't call SDL_SetError(): SDL_LoadObject already did.
} else {
retval = LoadDBUSSyms();
if (retval < 0) {
result = LoadDBUSSyms();
if (!result) {
UnloadDBUSLibrary();
}
}
}
return retval;
return result;
}
static SDL_SpinLock spinlock_dbus_init = 0;
@@ -136,7 +135,7 @@ static void SDL_DBus_Init_Spinlocked(void)
if (!dbus.session_conn) {
DBusError err;
if (LoadDBUSLibrary() == -1) {
if (!LoadDBUSLibrary()) {
is_dbus_available = false; // can't load at all? Don't keep trying.
return;
}
@@ -209,7 +208,7 @@ SDL_DBusContext *SDL_DBus_GetContext(void)
static bool SDL_DBus_CallMethodInternal(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *method, va_list ap)
{
bool retval = false;
bool result = false;
if (conn) {
DBusMessage *msg = dbus.message_new_method_call(node, path, interface, method);
@@ -237,7 +236,7 @@ static bool SDL_DBus_CallMethodInternal(DBusConnection *conn, const char *node,
}
firstarg = va_arg(ap_reply, int);
if ((firstarg == DBUS_TYPE_INVALID) || dbus.message_get_args_valist(reply, NULL, firstarg, ap_reply)) {
retval = true;
result = true;
}
dbus.message_unref(reply);
}
@@ -247,32 +246,32 @@ static bool SDL_DBus_CallMethodInternal(DBusConnection *conn, const char *node,
}
}
return retval;
return result;
}
bool SDL_DBus_CallMethodOnConnection(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *method, ...)
{
bool retval;
bool result;
va_list ap;
va_start(ap, method);
retval = SDL_DBus_CallMethodInternal(conn, node, path, interface, method, ap);
result = SDL_DBus_CallMethodInternal(conn, node, path, interface, method, ap);
va_end(ap);
return retval;
return result;
}
bool SDL_DBus_CallMethod(const char *node, const char *path, const char *interface, const char *method, ...)
{
bool retval;
bool result;
va_list ap;
va_start(ap, method);
retval = SDL_DBus_CallMethodInternal(dbus.session_conn, node, path, interface, method, ap);
result = SDL_DBus_CallMethodInternal(dbus.session_conn, node, path, interface, method, ap);
va_end(ap);
return retval;
return result;
}
static bool SDL_DBus_CallVoidMethodInternal(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *method, va_list ap)
{
bool retval = false;
bool result = false;
if (conn) {
DBusMessage *msg = dbus.message_new_method_call(node, path, interface, method);
@@ -281,7 +280,7 @@ static bool SDL_DBus_CallVoidMethodInternal(DBusConnection *conn, const char *no
if ((firstarg == DBUS_TYPE_INVALID) || dbus.message_append_args_valist(msg, firstarg, ap)) {
if (dbus.connection_send(conn, msg, NULL)) {
dbus.connection_flush(conn);
retval = true;
result = true;
}
}
@@ -289,7 +288,7 @@ static bool SDL_DBus_CallVoidMethodInternal(DBusConnection *conn, const char *no
}
}
return retval;
return result;
}
static bool SDL_DBus_CallWithBasicReply(DBusConnection *conn, DBusMessage *msg, const int expectedtype, void *result)
@@ -319,22 +318,22 @@ static bool SDL_DBus_CallWithBasicReply(DBusConnection *conn, DBusMessage *msg,
bool SDL_DBus_CallVoidMethodOnConnection(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *method, ...)
{
bool retval;
bool result;
va_list ap;
va_start(ap, method);
retval = SDL_DBus_CallVoidMethodInternal(conn, node, path, interface, method, ap);
result = SDL_DBus_CallVoidMethodInternal(conn, node, path, interface, method, ap);
va_end(ap);
return retval;
return result;
}
bool SDL_DBus_CallVoidMethod(const char *node, const char *path, const char *interface, const char *method, ...)
{
bool retval;
bool result;
va_list ap;
va_start(ap, method);
retval = SDL_DBus_CallVoidMethodInternal(dbus.session_conn, node, path, interface, method, ap);
result = SDL_DBus_CallVoidMethodInternal(dbus.session_conn, node, path, interface, method, ap);
va_end(ap);
return retval;
return result;
}
bool SDL_DBus_QueryPropertyOnConnection(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *property, const int expectedtype, void *result)
@@ -449,7 +448,7 @@ bool SDL_DBus_ScreensaverInhibit(bool inhibit)
if (inhibit) {
DBusMessage *msg;
bool retval = false;
bool result = false;
const char *key = "reason";
const char *reply = NULL;
const char *reason = SDL_GetHint(SDL_HINT_SCREENSAVER_INHIBIT_ACTIVITY_NAME);
@@ -477,11 +476,11 @@ bool SDL_DBus_ScreensaverInhibit(bool inhibit)
if (SDL_DBus_CallWithBasicReply(dbus.session_conn, msg, DBUS_TYPE_OBJECT_PATH, &reply)) {
inhibit_handle = SDL_strdup(reply);
retval = true;
result = true;
}
dbus.message_unref(msg);
return retval;
return result;
} else {
if (!SDL_DBus_CallVoidMethod(bus_name, inhibit_handle, "org.freedesktop.portal.Request", "Close", DBUS_TYPE_INVALID)) {
return false;

View File

@@ -132,9 +132,8 @@ static SDL_EVDEV_PrivateData *_this = NULL;
static SDL_Scancode SDL_EVDEV_translate_keycode(int keycode);
static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item);
static int SDL_EVDEV_device_removed(const char *dev_path);
static int SDL_EVDEV_device_added(const char *dev_path, int udev_class);
static bool SDL_EVDEV_device_removed(const char *dev_path);
static bool SDL_EVDEV_device_added(const char *dev_path, int udev_class);
#ifdef SDL_USE_LIBUDEV
static void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_event, int udev_class, const char *dev_path);
#endif // SDL_USE_LIBUDEV
@@ -150,10 +149,10 @@ static Uint8 EVDEV_MouseButtons[] = {
SDL_BUTTON_X2 + 3 // BTN_TASK 0x117
};
static int SDL_EVDEV_SetRelativeMouseMode(bool enabled)
static bool SDL_EVDEV_SetRelativeMouseMode(bool enabled)
{
// Mice already send relative events through this interface
return 0;
return true;
}
static void SDL_EVDEV_UpdateKeyboardMute(void)
@@ -165,27 +164,27 @@ static void SDL_EVDEV_UpdateKeyboardMute(void)
}
}
int SDL_EVDEV_Init(void)
SDL_bool SDL_EVDEV_Init(void)
{
if (!_this) {
_this = (SDL_EVDEV_PrivateData *)SDL_calloc(1, sizeof(*_this));
if (!_this) {
return -1;
return false;
}
#ifdef SDL_USE_LIBUDEV
if (SDL_UDEV_Init() < 0) {
if (!SDL_UDEV_Init()) {
SDL_free(_this);
_this = NULL;
return -1;
return false;
}
// Set up the udev callback
if (SDL_UDEV_AddCallback(SDL_EVDEV_udev_callback) < 0) {
if (!SDL_UDEV_AddCallback(SDL_EVDEV_udev_callback)) {
SDL_UDEV_Quit();
SDL_free(_this);
_this = NULL;
return -1;
return false;
}
// Force a scan to build the initial device list
@@ -226,7 +225,7 @@ int SDL_EVDEV_Init(void)
_this->ref_count += 1;
return 0;
return true;
}
void SDL_EVDEV_Quit(void)
@@ -603,7 +602,7 @@ static SDL_Scancode SDL_EVDEV_translate_keycode(int keycode)
return scancode;
}
static int SDL_EVDEV_init_keyboard(SDL_evdevlist_item *item, int udev_class)
static bool SDL_EVDEV_init_keyboard(SDL_evdevlist_item *item, int udev_class)
{
char name[128];
@@ -612,7 +611,7 @@ static int SDL_EVDEV_init_keyboard(SDL_evdevlist_item *item, int udev_class)
SDL_AddKeyboard((SDL_KeyboardID)item->fd, name, true);
return 0;
return true;
}
static void SDL_EVDEV_destroy_keyboard(SDL_evdevlist_item *item)
@@ -620,7 +619,7 @@ static void SDL_EVDEV_destroy_keyboard(SDL_evdevlist_item *item)
SDL_RemoveKeyboard((SDL_KeyboardID)item->fd, true);
}
static int SDL_EVDEV_init_mouse(SDL_evdevlist_item *item, int udev_class)
static bool SDL_EVDEV_init_mouse(SDL_evdevlist_item *item, int udev_class)
{
char name[128];
int ret;
@@ -634,7 +633,7 @@ static int SDL_EVDEV_init_mouse(SDL_evdevlist_item *item, int udev_class)
ret = ioctl(item->fd, EVIOCGABS(ABS_X), &abs_info);
if (ret < 0) {
// no absolute mode info, continue
return 0;
return true;
}
item->min_x = abs_info.minimum;
item->max_x = abs_info.maximum;
@@ -643,13 +642,13 @@ static int SDL_EVDEV_init_mouse(SDL_evdevlist_item *item, int udev_class)
ret = ioctl(item->fd, EVIOCGABS(ABS_Y), &abs_info);
if (ret < 0) {
// no absolute mode info, continue
return 0;
return true;
}
item->min_y = abs_info.minimum;
item->max_y = abs_info.maximum;
item->range_y = abs_info.maximum - abs_info.minimum;
return 0;
return true;
}
static void SDL_EVDEV_destroy_mouse(SDL_evdevlist_item *item)
@@ -657,7 +656,7 @@ static void SDL_EVDEV_destroy_mouse(SDL_evdevlist_item *item)
SDL_RemoveMouse((SDL_MouseID)item->fd, true);
}
static int SDL_EVDEV_init_touchscreen(SDL_evdevlist_item *item, int udev_class)
static bool SDL_EVDEV_init_touchscreen(SDL_evdevlist_item *item, int udev_class)
{
int ret;
unsigned long xreq, yreq;
@@ -665,12 +664,12 @@ static int SDL_EVDEV_init_touchscreen(SDL_evdevlist_item *item, int udev_class)
struct input_absinfo abs_info;
if (!item->is_touchscreen) {
return 0;
return true;
}
item->touchscreen_data = SDL_calloc(1, sizeof(*item->touchscreen_data));
if (!item->touchscreen_data) {
return -1;
return false;
}
ret = ioctl(item->fd, EVIOCGNAME(sizeof(name)), name);
@@ -682,7 +681,7 @@ static int SDL_EVDEV_init_touchscreen(SDL_evdevlist_item *item, int udev_class)
item->touchscreen_data->name = SDL_strdup(name);
if (!item->touchscreen_data->name) {
SDL_free(item->touchscreen_data);
return -1;
return false;
}
ret = ioctl(item->fd, EVIOCGABS(ABS_MT_SLOT), &abs_info);
@@ -738,7 +737,7 @@ static int SDL_EVDEV_init_touchscreen(SDL_evdevlist_item *item, int udev_class)
if (!item->touchscreen_data->slots) {
SDL_free(item->touchscreen_data->name);
SDL_free(item->touchscreen_data);
return -1;
return false;
}
ret = SDL_AddTouch(item->fd, // I guess our fd is unique enough
@@ -748,10 +747,10 @@ static int SDL_EVDEV_init_touchscreen(SDL_evdevlist_item *item, int udev_class)
SDL_free(item->touchscreen_data->slots);
SDL_free(item->touchscreen_data->name);
SDL_free(item->touchscreen_data);
return ret;
return false;
}
return 0;
return true;
}
static void SDL_EVDEV_destroy_touchscreen(SDL_evdevlist_item *item)
@@ -891,7 +890,7 @@ static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
#endif // EVIOCGMTSLOTS
}
static int SDL_EVDEV_device_added(const char *dev_path, int udev_class)
static bool SDL_EVDEV_device_added(const char *dev_path, int udev_class)
{
SDL_evdevlist_item *item;
unsigned long relbit[NBITS(REL_MAX)] = { 0 };
@@ -899,13 +898,13 @@ static int SDL_EVDEV_device_added(const char *dev_path, int udev_class)
// Check to make sure it's not already in list.
for (item = _this->first; item; item = item->next) {
if (SDL_strcmp(dev_path, item->path) == 0) {
return -1; // already have this one
return false; // already have this one
}
}
item = (SDL_evdevlist_item *)SDL_calloc(1, sizeof(SDL_evdevlist_item));
if (!item) {
return -1;
return false;
}
item->fd = open(dev_path, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
@@ -918,7 +917,7 @@ static int SDL_EVDEV_device_added(const char *dev_path, int udev_class)
if (!item->path) {
close(item->fd);
SDL_free(item);
return -1;
return false;
}
item->udev_class = udev_class;
@@ -931,30 +930,26 @@ static int SDL_EVDEV_device_added(const char *dev_path, int udev_class)
// For now, we just treat a touchpad like a touchscreen
if (udev_class & (SDL_UDEV_DEVICE_TOUCHSCREEN | SDL_UDEV_DEVICE_TOUCHPAD)) {
int ret;
item->is_touchscreen = true;
ret = SDL_EVDEV_init_touchscreen(item, udev_class);
if (ret < 0) {
if (!SDL_EVDEV_init_touchscreen(item, udev_class)) {
close(item->fd);
SDL_free(item->path);
SDL_free(item);
return ret;
return false;
}
} else if (udev_class & SDL_UDEV_DEVICE_MOUSE) {
int ret = SDL_EVDEV_init_mouse(item, udev_class);
if (ret < 0) {
if (!SDL_EVDEV_init_mouse(item, udev_class)) {
close(item->fd);
SDL_free(item->path);
SDL_free(item);
return ret;
return false;
}
} else if (udev_class & SDL_UDEV_DEVICE_KEYBOARD) {
int ret = SDL_EVDEV_init_keyboard(item, udev_class);
if (ret < 0) {
if (!SDL_EVDEV_init_keyboard(item, udev_class)) {
close(item->fd);
SDL_free(item->path);
SDL_free(item);
return ret;
return false;
}
}
@@ -969,10 +964,11 @@ static int SDL_EVDEV_device_added(const char *dev_path, int udev_class)
SDL_EVDEV_UpdateKeyboardMute();
return _this->num_devices++;
++_this->num_devices;
return true;
}
static int SDL_EVDEV_device_removed(const char *dev_path)
static bool SDL_EVDEV_device_removed(const char *dev_path)
{
SDL_evdevlist_item *item;
SDL_evdevlist_item *prev = NULL;
@@ -1001,12 +997,12 @@ static int SDL_EVDEV_device_removed(const char *dev_path)
SDL_free(item);
SDL_EVDEV_UpdateKeyboardMute();
_this->num_devices--;
return 0;
return true;
}
prev = item;
}
return -1;
return false;
}
Uint64 SDL_EVDEV_GetEventTimestamp(struct input_event *event)

View File

@@ -28,7 +28,7 @@
struct input_event;
extern int SDL_EVDEV_Init(void);
extern SDL_bool SDL_EVDEV_Init(void);
extern void SDL_EVDEV_Quit(void);
extern void SDL_EVDEV_SetVTSwitchCallbacks(void (*release_callback)(void*), void *release_callback_data,
void (*acquire_callback)(void*), void *acquire_callback_data);

View File

@@ -378,7 +378,7 @@ static void kbd_vt_quit(int console_fd)
ioctl(console_fd, VT_SETMODE, &mode);
}
static int kbd_vt_init(int console_fd)
static bool kbd_vt_init(int console_fd)
{
struct vt_mode mode;
@@ -386,7 +386,7 @@ static int kbd_vt_init(int console_fd)
vt_acquire_signal = find_free_signal(kbd_vt_acquire_signal_action);
if (!vt_release_signal || !vt_acquire_signal ) {
kbd_vt_quit(console_fd);
return -1;
return false;
}
SDL_zero(mode);
@@ -396,9 +396,9 @@ static int kbd_vt_init(int console_fd)
mode.frsig = SIGIO;
if (ioctl(console_fd, VT_SETMODE, &mode) < 0) {
kbd_vt_quit(console_fd);
return -1;
return false;
}
return 0;
return true;
}
static void kbd_vt_update(SDL_EVDEV_keyboard_state *state)
@@ -618,7 +618,7 @@ static unsigned int handle_diacr(SDL_EVDEV_keyboard_state *kbd, unsigned int ch)
return ch;
}
static int vc_kbd_led(SDL_EVDEV_keyboard_state *kbd, int flag)
static bool vc_kbd_led(SDL_EVDEV_keyboard_state *kbd, int flag)
{
return (kbd->ledflagstate & flag) != 0;
}

View File

@@ -252,7 +252,7 @@ static void SDLCALL Fcitx_SetCapabilities(void *data,
static bool FcitxCreateInputContext(SDL_DBusContext *dbus, const char *appname, char **ic_path)
{
const char *program = "program";
bool retval = false;
bool result = false;
if (dbus && dbus->session_conn) {
DBusMessage *msg = dbus->message_new_method_call(FCITX_DBUS_SERVICE, FCITX_IM_DBUS_PATH, FCITX_IM_DBUS_INTERFACE, "CreateInputContext");
@@ -269,14 +269,14 @@ static bool FcitxCreateInputContext(SDL_DBusContext *dbus, const char *appname,
reply = dbus->connection_send_with_reply_and_block(dbus->session_conn, msg, 300, NULL);
if (reply) {
if (dbus->message_get_args(reply, NULL, DBUS_TYPE_OBJECT_PATH, ic_path, DBUS_TYPE_INVALID)) {
retval = true;
result = true;
}
dbus->message_unref(reply);
}
dbus->message_unref(msg);
}
}
return retval;
return result;
}
static bool FcitxClientCreateIC(FcitxClient *client)

View File

@@ -249,13 +249,13 @@ static bool rtkit_setpriority_realtime(pid_t thread, int rt_priority)
#endif // threads
// this is a public symbol, so it has to exist even if threads are disabled.
int SDL_SetLinuxThreadPriority(Sint64 threadID, int priority)
SDL_bool SDL_SetLinuxThreadPriority(Sint64 threadID, int priority)
{
#ifdef SDL_THREADS_DISABLED
return SDL_Unsupported();
#else
if (setpriority(PRIO_PROCESS, (id_t)threadID, priority) == 0) {
return 0;
return true;
}
#ifdef SDL_USE_LIBDBUS
@@ -272,7 +272,7 @@ int SDL_SetLinuxThreadPriority(Sint64 threadID, int priority)
README and sample code at: http://git.0pointer.net/rtkit.git
*/
if (rtkit_setpriority_nice((pid_t)threadID, priority)) {
return 0;
return true;
}
#endif
@@ -281,7 +281,7 @@ int SDL_SetLinuxThreadPriority(Sint64 threadID, int priority)
}
// this is a public symbol, so it has to exist even if threads are disabled.
int SDL_SetLinuxThreadPriorityAndPolicy(Sint64 threadID, int sdlPriority, int schedPolicy)
SDL_bool SDL_SetLinuxThreadPriorityAndPolicy(Sint64 threadID, int sdlPriority, int schedPolicy)
{
#ifdef SDL_THREADS_DISABLED
return SDL_Unsupported();
@@ -310,7 +310,7 @@ int SDL_SetLinuxThreadPriorityAndPolicy(Sint64 threadID, int sdlPriority, int sc
}
if (setpriority(PRIO_PROCESS, (id_t)threadID, osPriority) == 0) {
return 0;
return true;
}
}
@@ -329,11 +329,11 @@ int SDL_SetLinuxThreadPriorityAndPolicy(Sint64 threadID, int sdlPriority, int sc
*/
if (schedPolicy == SCHED_RR || schedPolicy == SCHED_FIFO) {
if (rtkit_setpriority_realtime((pid_t)threadID, osPriority)) {
return 0;
return true;
}
} else {
if (rtkit_setpriority_nice((pid_t)threadID, osPriority)) {
return 0;
return true;
}
}
#endif

View File

@@ -41,7 +41,7 @@ static const char *SDL_UDEV_LIBS[] = { "libudev.so.1", "libudev.so.0" };
static SDL_UDEV_PrivateData *_this = NULL;
static bool SDL_UDEV_load_sym(const char *fn, void **addr);
static int SDL_UDEV_load_syms(void);
static bool SDL_UDEV_load_syms(void);
static bool SDL_UDEV_hotplug_update_available(void);
static void get_caps(struct udev_device *dev, struct udev_device *pdev, const char *attr, unsigned long *bitmask, size_t bitmask_len);
static int guess_device_class(struct udev_device *dev);
@@ -59,12 +59,12 @@ static bool SDL_UDEV_load_sym(const char *fn, void **addr)
return true;
}
static int SDL_UDEV_load_syms(void)
static bool SDL_UDEV_load_syms(void)
{
/* cast funcs to char* first, to please GCC's strict aliasing rules. */
#define SDL_UDEV_SYM(x) \
if (!SDL_UDEV_load_sym(#x, (void **)(char *)&_this->syms.x)) \
return -1
return false
SDL_UDEV_SYM(udev_device_get_action);
SDL_UDEV_SYM(udev_device_get_devnode);
@@ -95,7 +95,7 @@ static int SDL_UDEV_load_syms(void)
SDL_UDEV_SYM(udev_device_get_devnum);
#undef SDL_UDEV_SYM
return 0;
return true;
}
static bool SDL_UDEV_hotplug_update_available(void)
@@ -109,20 +109,17 @@ static bool SDL_UDEV_hotplug_update_available(void)
return false;
}
int SDL_UDEV_Init(void)
bool SDL_UDEV_Init(void)
{
int retval = 0;
if (!_this) {
_this = (SDL_UDEV_PrivateData *)SDL_calloc(1, sizeof(*_this));
if (!_this) {
return -1;
return false;
}
retval = SDL_UDEV_LoadLibrary();
if (retval < 0) {
if (!SDL_UDEV_LoadLibrary()) {
SDL_UDEV_Quit();
return retval;
return false;
}
/* Set up udev monitoring
@@ -152,7 +149,7 @@ int SDL_UDEV_Init(void)
_this->ref_count += 1;
return retval;
return true;
}
void SDL_UDEV_Quit(void)
@@ -187,14 +184,14 @@ void SDL_UDEV_Quit(void)
}
}
int SDL_UDEV_Scan(void)
bool SDL_UDEV_Scan(void)
{
struct udev_enumerate *enumerate = NULL;
struct udev_list_entry *devs = NULL;
struct udev_list_entry *item = NULL;
if (!_this) {
return 0;
return true;
}
enumerate = _this->syms.udev_enumerate_new(_this->udev);
@@ -219,7 +216,7 @@ int SDL_UDEV_Scan(void)
}
_this->syms.udev_enumerate_unref(enumerate);
return 0;
return true;
}
bool SDL_UDEV_GetProductInfo(const char *device_path, Uint16 *vendor, Uint16 *product, Uint16 *version, int *class)
@@ -291,17 +288,17 @@ void SDL_UDEV_UnloadLibrary(void)
}
}
int SDL_UDEV_LoadLibrary(void)
bool SDL_UDEV_LoadLibrary(void)
{
int retval = 0, i;
bool result = true;
if (!_this) {
return SDL_SetError("UDEV not initialized");
}
// See if there is a udev library already loaded
if (SDL_UDEV_load_syms() == 0) {
return 0;
if (SDL_UDEV_load_syms()) {
return true;
}
#ifdef SDL_UDEV_DYNAMIC
@@ -309,8 +306,8 @@ int SDL_UDEV_LoadLibrary(void)
if (!_this->udev_handle) {
_this->udev_handle = SDL_LoadObject(SDL_UDEV_DYNAMIC);
if (_this->udev_handle) {
retval = SDL_UDEV_load_syms();
if (retval < 0) {
result = SDL_UDEV_load_syms();
if (!result) {
SDL_UDEV_UnloadLibrary();
}
}
@@ -318,11 +315,11 @@ int SDL_UDEV_LoadLibrary(void)
#endif
if (!_this->udev_handle) {
for (i = 0; i < SDL_arraysize(SDL_UDEV_LIBS); i++) {
for (int i = 0; i < SDL_arraysize(SDL_UDEV_LIBS); i++) {
_this->udev_handle = SDL_LoadObject(SDL_UDEV_LIBS[i]);
if (_this->udev_handle) {
retval = SDL_UDEV_load_syms();
if (retval < 0) {
result = SDL_UDEV_load_syms();
if (!result) {
SDL_UDEV_UnloadLibrary();
} else {
break;
@@ -331,12 +328,12 @@ int SDL_UDEV_LoadLibrary(void)
}
if (!_this->udev_handle) {
retval = -1;
result = false;
// Don't call SDL_SetError(): SDL_LoadObject already did.
}
}
return retval;
return result;
}
static void get_caps(struct udev_device *dev, struct udev_device *pdev, const char *attr, unsigned long *bitmask, size_t bitmask_len)
@@ -529,12 +526,12 @@ void SDL_UDEV_Poll(void)
}
}
int SDL_UDEV_AddCallback(SDL_UDEV_Callback cb)
bool SDL_UDEV_AddCallback(SDL_UDEV_Callback cb)
{
SDL_UDEV_CallbackList *item;
item = (SDL_UDEV_CallbackList *)SDL_calloc(1, sizeof(SDL_UDEV_CallbackList));
if (!item) {
return -1;
return false;
}
item->callback = cb;
@@ -546,7 +543,7 @@ int SDL_UDEV_AddCallback(SDL_UDEV_Callback cb)
_this->last = item;
}
return 0;
return true;
}
void SDL_UDEV_DelCallback(SDL_UDEV_Callback cb)
@@ -579,7 +576,7 @@ void SDL_UDEV_DelCallback(SDL_UDEV_Callback cb)
const SDL_UDEV_Symbols *SDL_UDEV_GetUdevSyms(void)
{
if (SDL_UDEV_Init() < 0) {
if (!SDL_UDEV_Init()) {
SDL_SetError("Could not initialize UDEV");
return NULL;
}

View File

@@ -96,14 +96,14 @@ typedef struct SDL_UDEV_PrivateData
SDL_UDEV_Symbols syms;
} SDL_UDEV_PrivateData;
extern int SDL_UDEV_Init(void);
extern bool SDL_UDEV_Init(void);
extern void SDL_UDEV_Quit(void);
extern void SDL_UDEV_UnloadLibrary(void);
extern int SDL_UDEV_LoadLibrary(void);
extern bool SDL_UDEV_LoadLibrary(void);
extern void SDL_UDEV_Poll(void);
extern int SDL_UDEV_Scan(void);
extern bool SDL_UDEV_Scan(void);
extern bool SDL_UDEV_GetProductInfo(const char *device_path, Uint16 *vendor, Uint16 *product, Uint16 *version, int *class);
extern int SDL_UDEV_AddCallback(SDL_UDEV_Callback cb);
extern bool SDL_UDEV_AddCallback(SDL_UDEV_Callback cb);
extern void SDL_UDEV_DelCallback(SDL_UDEV_Callback cb);
extern const SDL_UDEV_Symbols *SDL_UDEV_GetUdevSyms(void);
extern void SDL_UDEV_ReleaseUdevSyms(void);