piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 21:30:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Lint.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5716 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-06-16 00:58:34 +00:00
parent f8cf2aaa3e
commit 494ba1eba2
3 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Externals/SDL/src/joystick/linux/SDL_sysjoystick.c vendored
View File

@ -500,25 +500,25 @@ int SDL_SYS_JoystickInit(void)
}
/* Function to get the device-dependent name of a joystick */
const char *SDL_SYS_JoystickName(int index)
const char *SDL_SYS_JoystickName(int jindex)
{
int fd;
static char namebuf[128];
char *name;
SDL_logical_joydecl(int oindex = index);
SDL_logical_joydecl(int oindex = jindex);
#ifndef NO_LOGICAL_JOYSTICKS
SDL_joylist_head(index, index);
SDL_joylist_head(jindex, jindex);
#endif
name = NULL;
fd = open(SDL_joylist[index].fname, O_RDONLY, 0);
fd = open(SDL_joylist[jindex].fname, O_RDONLY, 0);
if ( fd >= 0 ) {
if (
#if SDL_INPUT_LINUXEV
(ioctl(fd, EVIOCGNAME(sizeof(namebuf)), namebuf) <= 0) &&
#endif
(ioctl(fd, JSIOCGNAME(sizeof(namebuf)), namebuf) <= 0) ) {
name = SDL_joylist[index].fname;
name = SDL_joylist[jindex].fname;
} else {
name = namebuf;
}
@ -526,7 +526,7 @@ const char *SDL_SYS_JoystickName(int index)
#ifndef NO_LOGICAL_JOYSTICKS
if (SDL_joylist[oindex].prev || SDL_joylist[oindex].next || index!=oindex)
if (SDL_joylist[oindex].prev || SDL_joylist[oindex].next || jindex!=oindex)
{
LogicalSuffix(SDL_joylist[oindex].logicalno, namebuf, 128);
}