Rename more local index variables

This commit is contained in:
twinaphex 2014-10-21 00:11:50 +02:00
parent a14bfdfca2
commit a92ec148bd
2 changed files with 11 additions and 11 deletions

View File

@ -45,11 +45,11 @@ static bool is_long_option(const char *str)
static int find_short_index(char * const *argv)
{
int index;
for (index = 0; argv[index]; index++)
int idx;
for (idx = 0; argv[idx]; idx++)
{
if (is_short_option(argv[index]))
return index;
if (is_short_option(argv[idx]))
return idx;
}
return -1;
@ -57,11 +57,11 @@ static int find_short_index(char * const *argv)
static int find_long_index(char * const *argv)
{
int index;
for (index = 0; argv[index]; index++)
int idx;
for (idx = 0; argv[idx]; idx++)
{
if (is_long_option(argv[index]))
return index;
if (is_long_option(argv[idx]))
return idx;
}
return -1;

View File

@ -272,7 +272,7 @@ static void x86_cpuid(int func, int flags[4])
}
/* Only runs on i686 and above. Needs to be conditionally run. */
static uint64_t xgetbv_x86(uint32_t index)
static uint64_t xgetbv_x86(uint32_t idx)
{
#if defined(__GNUC__)
uint32_t eax, edx;
@ -282,11 +282,11 @@ static uint64_t xgetbv_x86(uint32_t index)
* Stamp out the machine code directly.
*/
".byte 0x0f, 0x01, 0xd0\n"
: "=a"(eax), "=d"(edx) : "c"(index));
: "=a"(eax), "=d"(edx) : "c"(idx));
return ((uint64_t)edx << 32) | eax;
#elif _MSC_FULL_VER >= 160040219
/* Intrinsic only works on 2010 SP1 and above. */
return _xgetbv(index);
return _xgetbv(idx);
#else
RARCH_WARN("Unknown compiler. Cannot check xgetbv bits.\n");
return 0;