Mercurial > sdl-ios-xcode
diff src/joystick/macos/SDL_sysjoystick.c @ 1336:3692456e7b0f
Use SDL_ prefixed versions of C library functions.
FIXME:
Change #include <stdlib.h> to #include "SDL_stdlib.h"
Change #include <string.h> to #include "SDL_string.h"
Make sure nothing else broke because of this...
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Tue, 07 Feb 2006 06:59:48 +0000 |
parents | c9b51268668f |
children | c71e05b4dc2e |
line wrap: on
line diff
--- a/src/joystick/macos/SDL_sysjoystick.c Mon Feb 06 17:28:04 2006 +0000 +++ b/src/joystick/macos/SDL_sysjoystick.c Tue Feb 07 06:59:48 2006 +0000 @@ -137,7 +137,7 @@ if ( len >= sizeof(name) ) { len = (sizeof(name) - 1); } - memcpy(name, &SYS_DevDef[index].deviceName[1], len); + SDL_memcpy(name, &SYS_DevDef[index].deviceName[1], len); name[len] = '\0'; return name; @@ -161,14 +161,14 @@ index = joystick->index; /* allocate memory for system specific hardware data */ - joystick->hwdata = (struct joystick_hwdata *) malloc(sizeof(*joystick->hwdata)); + joystick->hwdata = (struct joystick_hwdata *) SDL_malloc(sizeof(*joystick->hwdata)); if (joystick->hwdata == NULL) { SDL_OutOfMemory(); return(-1); } - memset(joystick->hwdata, 0, sizeof(*joystick->hwdata)); - strcpy(joystick->hwdata->name, SDL_SYS_JoystickName(index)); + SDL_memset(joystick->hwdata, 0, sizeof(*joystick->hwdata)); + SDL_strcpy(joystick->hwdata->name, SDL_SYS_JoystickName(index)); joystick->name = joystick->hwdata->name; ISpElementList_ExtractByKind(