From 1c079107789c1cc8520e1605fedbb1b0a80b7460 Mon Sep 17 00:00:00 2001 From: Edgar Simo Date: Sun, 10 Aug 2008 19:53:58 +0000 Subject: [PATCH] Casting for warnings. Fixed possible segfault. --- src/haptic/darwin/SDL_syshaptic.c | 8 +++++++- src/joystick/darwin/SDL_sysjoystick.c | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/haptic/darwin/SDL_syshaptic.c b/src/haptic/darwin/SDL_syshaptic.c index 8fb9c8628..22376fe55 100644 --- a/src/haptic/darwin/SDL_syshaptic.c +++ b/src/haptic/darwin/SDL_syshaptic.c @@ -162,6 +162,11 @@ SDL_SYS_HapticInit(void) } /* IOServiceGetMatchingServices consumes dictionary. */ + if (!iter) { /* No iterator. */ + numhaptics = 0; + return 0; + } + numhaptics = 0; while ((device = IOIteratorNext(iter)) != IO_OBJECT_NULL) { @@ -459,7 +464,8 @@ SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick) int SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick) { - if (IOObjectIsEqualTo(haptic->hwdata->device, joystick->hwdata->ffservice)) + if (IOObjectIsEqualTo((io_object_t) haptic->hwdata->device, + joystick->hwdata->ffservice)) return 1; return 0; } diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c index de9cac9cd..025e33420 100644 --- a/src/joystick/darwin/SDL_sysjoystick.c +++ b/src/joystick/darwin/SDL_sysjoystick.c @@ -649,7 +649,7 @@ SDL_SYS_JoystickInit(void) /* We have to do some storage of the io_service_t for * SDL_HapticOpenFromJoystick */ - if (FFIsForceFeedback(device) == FF_OK) { + if (FFIsForceFeedback((io_service_t)device) == FF_OK) { device->ffservice = ioHIDDeviceObject; } else {