libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 00:20:01 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(OSX 10.6) Fix declaration shadows global variable warnings

Browse Source
This commit is contained in:
twinaphex 2015-01-15 21:10:36 +01:00
parent d830ad38af
commit 26ab324727
10 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/audio_driver.c
View File

@ -135,14 +135,14 @@ static void compute_audio_buffer_statistics(void)
/**
* audio_driver_find_handle:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: handle to audio driver at index. Can be NULL
* if nothing found.
**/
const void *audio_driver_find_handle(int index)
const void *audio_driver_find_handle(int idx)
{
const void *drv = audio_drivers[index];
const void *drv = audio_drivers[idx];
if (!drv)
return NULL;
return drv;
@ -150,14 +150,14 @@ const void *audio_driver_find_handle(int index)
/**
* audio_driver_find_ident:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: Human-readable identifier of audio driver at index. Can be NULL
* if nothing found.
**/
const char *audio_driver_find_ident(int index)
const char *audio_driver_find_ident(int idx)
{
const audio_driver_t *drv = audio_drivers[index];
const audio_driver_t *drv = audio_drivers[idx];
if (!drv)
return NULL;
return drv->ident;

12
audio/audio_resampler_driver.c
View File

@ -61,14 +61,14 @@ static int find_resampler_driver_index(const char *ident)
/**
* audio_resampler_driver_find_handle:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: handle to audio resampler driver at index. Can be NULL
* if nothing found.
**/
const void *audio_resampler_driver_find_handle(int index)
const void *audio_resampler_driver_find_handle(int idx)
{
const void *drv = resampler_drivers[index];
const void *drv = resampler_drivers[idx];
if (!drv)
return NULL;
return drv;
@ -76,14 +76,14 @@ const void *audio_resampler_driver_find_handle(int index)
/**
* audio_resampler_driver_find_ident:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: Human-readable identifier of audio resampler driver at index.
* Can be NULL if nothing found.
**/
const char *audio_resampler_driver_find_ident(int index)
const char *audio_resampler_driver_find_ident(int idx)
{
const rarch_resampler_t *drv = resampler_drivers[index];
const rarch_resampler_t *drv = resampler_drivers[idx];
if (!drv)
return NULL;
return drv->ident;

12
camera/camera_driver.c
View File

@ -39,14 +39,14 @@ static const camera_driver_t *camera_drivers[] = {
/**
* camera_driver_find_handle:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: handle to camera driver at index. Can be NULL
* if nothing found.
**/
const void *camera_driver_find_handle(int index)
const void *camera_driver_find_handle(int idx)
{
const void *drv = camera_drivers[index];
const void *drv = camera_drivers[idx];
if (!drv)
return NULL;
return drv;
@ -54,14 +54,14 @@ const void *camera_driver_find_handle(int index)
/**
* camera_driver_find_ident:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: Human-readable identifier of camera driver at index. Can be NULL
* if nothing found.
**/
const char *camera_driver_find_ident(int index)
const char *camera_driver_find_ident(int idx)
{
const camera_driver_t *drv = camera_drivers[index];
const camera_driver_t *drv = camera_drivers[idx];
if (!drv)
return NULL;
return drv->ident;

12
gfx/video_driver.c
View File

@ -63,14 +63,14 @@ static const video_driver_t *video_drivers[] = {
/**
* video_driver_find_handle:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: handle to video driver at index. Can be NULL
* if nothing found.
**/
const void *video_driver_find_handle(int index)
const void *video_driver_find_handle(int idx)
{
const void *drv = video_drivers[index];
const void *drv = video_drivers[idx];
if (!drv)
return NULL;
return drv;
@ -78,14 +78,14 @@ const void *video_driver_find_handle(int index)
/**
* video_driver_find_ident:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: Human-readable identifier of video driver at index. Can be NULL
* if nothing found.
**/
const char *video_driver_find_ident(int index)
const char *video_driver_find_ident(int idx)
{
const video_driver_t *drv = video_drivers[index];
const video_driver_t *drv = video_drivers[idx];
if (!drv)
return NULL;
return drv->ident;

12
input/input_driver.c
View File

@ -70,14 +70,14 @@ static const input_driver_t *input_drivers[] = {
/**
* input_driver_find_handle:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: handle to input driver at index. Can be NULL
* if nothing found.
**/
const void *input_driver_find_handle(int index)
const void *input_driver_find_handle(int idx)
{
const void *drv = input_drivers[index];
const void *drv = input_drivers[idx];
if (!drv)
return NULL;
return drv;
@ -85,14 +85,14 @@ const void *input_driver_find_handle(int index)
/**
* input_driver_find_ident:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: Human-readable identifier of input driver at index. Can be NULL
* if nothing found.
**/
const char *input_driver_find_ident(int index)
const char *input_driver_find_ident(int idx)
{
const input_driver_t *drv = input_drivers[index];
const input_driver_t *drv = input_drivers[idx];
if (!drv)
return NULL;
return drv->ident;

12
input/input_joypad_driver.c
View File

@ -73,14 +73,14 @@ static rarch_joypad_driver_t *joypad_drivers[] = {
/**
* joypad_driver_find_handle:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: handle to joypad driver at index. Can be NULL
* if nothing found.
**/
const void *joypad_driver_find_handle(int index)
const void *joypad_driver_find_handle(int idx)
{
const void *drv = joypad_drivers[index];
const void *drv = joypad_drivers[idx];
if (!drv)
return NULL;
return drv;
@ -88,14 +88,14 @@ const void *joypad_driver_find_handle(int index)
/**
* joypad_driver_find_ident:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: Human-readable identifier of joypad driver at index. Can be NULL
* if nothing found.
**/
const char *joypad_driver_find_ident(int index)
const char *joypad_driver_find_ident(int idx)
{
const rarch_joypad_driver_t *drv = joypad_drivers[index];
const rarch_joypad_driver_t *drv = joypad_drivers[idx];
if (!drv)
return NULL;
return drv->ident;

12
location/location_driver.c
View File

@ -35,14 +35,14 @@ static const location_driver_t *location_drivers[] = {
/**
* location_driver_find_handle:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: handle to location driver at index. Can be NULL
* if nothing found.
**/
const void *location_driver_find_handle(int index)
const void *location_driver_find_handle(int idx)
{
const void *drv = location_drivers[index];
const void *drv = location_drivers[idx];
if (!drv)
return NULL;
return drv;
@ -50,14 +50,14 @@ const void *location_driver_find_handle(int index)
/**
* location_driver_find_ident:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: Human-readable identifier of location driver at index. Can be NULL
* if nothing found.
**/
const char *location_driver_find_ident(int index)
const char *location_driver_find_ident(int idx)
{
const location_driver_t *drv = location_drivers[index];
const location_driver_t *drv = location_drivers[idx];
if (!drv)
return NULL;
return drv->ident;

12
menu/menu_driver.c
View File

@ -48,14 +48,14 @@ static const menu_ctx_driver_t *menu_ctx_drivers[] = {
/**
* menu_driver_find_handle:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: handle to menu driver at index. Can be NULL
* if nothing found.
**/
const void *menu_driver_find_handle(int index)
const void *menu_driver_find_handle(int idx)
{
const void *drv = menu_ctx_drivers[index];
const void *drv = menu_ctx_drivers[idx];
if (!drv)
return NULL;
return drv;
@ -63,14 +63,14 @@ const void *menu_driver_find_handle(int index)
/**
* menu_driver_find_ident:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: Human-readable identifier of menu driver at index. Can be NULL
* if nothing found.
**/
const char *menu_driver_find_ident(int index)
const char *menu_driver_find_ident(int idx)
{
const menu_ctx_driver_t *drv = menu_ctx_drivers[index];
const menu_ctx_driver_t *drv = menu_ctx_drivers[idx];
if (!drv)
return NULL;
return drv->ident;

12
osk/osk_driver.c
View File

@ -30,14 +30,14 @@ static const input_osk_driver_t *osk_drivers[] = {
/**
* osk_driver_find_handle:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: handle to OSK driver at index. Can be NULL
* if nothing found.
**/
const void *osk_driver_find_handle(int index)
const void *osk_driver_find_handle(int idx)
{
const void *drv = osk_drivers[index];
const void *drv = osk_drivers[idx];
if (!drv)
return NULL;
return drv;
@ -45,14 +45,14 @@ const void *osk_driver_find_handle(int index)
/**
* osk_driver_find_ident:
* @index : index of driver to get handle to.
* @idx : index of driver to get handle to.
*
* Returns: Human-readable identifier of OSK driver at index. Can be NULL
* if nothing found.
**/
const char *osk_driver_find_ident(int index)
const char *osk_driver_find_ident(int idx)
{
const input_osk_driver_t *drv = osk_drivers[index];
const input_osk_driver_t *drv = osk_drivers[idx];
if (!drv)
return NULL;
return drv->ident;

30
retroarch.c
View File

@ -1777,11 +1777,11 @@ void rarch_disk_control_set_eject(bool new_state, bool print_log)
/**
* rarch_disk_control_set_index:
* @index : Index of disk to set as current.
* @idx : Index of disk to set as current.
*
* Sets current disk to @index.
**/
void rarch_disk_control_set_index(unsigned index)
void rarch_disk_control_set_index(unsigned idx)
{
char msg[PATH_MAX_LENGTH];
unsigned num_disks;
@ -1796,19 +1796,19 @@ void rarch_disk_control_set_index(unsigned index)
num_disks = control->get_num_images();
if (control->set_image_index(index))
if (control->set_image_index(idx))
{
if (index < num_disks)
if (idx < num_disks)
snprintf(msg, sizeof(msg), "Setting disk %u of %u in tray.",
index + 1, num_disks);
idx + 1, num_disks);
else
strlcpy(msg, "Removed disk from tray.", sizeof(msg));
}
else
{
if (index < num_disks)
if (idx < num_disks)
snprintf(msg, sizeof(msg), "Failed to set disk %u of %u.",
index + 1, num_disks);
idx + 1, num_disks);
else
strlcpy(msg, "Failed to remove disk from tray.", sizeof(msg));
error = true;
@ -1847,11 +1847,11 @@ static void check_disk_eject(
static void check_disk_next(
const struct retro_disk_control_callback *control)
{
unsigned num_disks = control->get_num_images();
unsigned current = control->get_image_index();
bool check_disk_next = num_disks && num_disks != UINT_MAX;
unsigned num_disks = control->get_num_images();
unsigned current = control->get_image_index();
bool disk_next_enable = num_disks && num_disks != UINT_MAX;
if (!check_disk_next)
if (!disk_next_enable)
{
RARCH_ERR("Got invalid disk index from libretro.\n");
return;
@ -1871,11 +1871,11 @@ static void check_disk_next(
static void check_disk_prev(
const struct retro_disk_control_callback *control)
{
unsigned num_disks = control->get_num_images();
unsigned current = control->get_image_index();
bool check_disk_prev = num_disks && num_disks != UINT_MAX;
unsigned num_disks = control->get_num_images();
unsigned current = control->get_image_index();
bool disk_prev_enable = num_disks && num_disks != UINT_MAX;
if (!check_disk_prev)
if (!disk_prev_enable)
{
RARCH_ERR("Got invalid disk index from libretro.\n");
return;