ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use the standard library method sscanf(), not sscanf_s().

This commit is contained in:
unknown 2015-10-27 17:03:19 -04:00
parent 7f5f64e00f
commit fa8f78028c
1 changed files with 22 additions and 22 deletions
Source/nragev20
XInputController.cpp

44
Source/nragev20/XInputController.cpp
View File

@ -738,49 +738,49 @@ void LoadXInputConfigFromFile( FILE *file, LPXCONTROLLER gController )
switch( buffer[0] ) switch( buffer[0] )
{ {
case 'A': case 'A':
sscanf_s( buffer, "A=%lu", &gController->stButtons.iA ); break; sscanf(buffer, "A=%lu", &gController->stButtons.iA); break;
case 'B': case 'B':
sscanf_s( buffer, "B=%lu", &gController->stButtons.iB ); break; sscanf(buffer, "B=%lu", &gController->stButtons.iB); break;
case 'C': case 'C':
switch( buffer[1] ) switch( buffer[1] )
{ {
case 'U': case 'U':
sscanf_s( buffer, "CUp=%lu", &gController->stButtons.iCUp ); break; sscanf(buffer, "CUp=%lu", &gController->stButtons.iCUp); break;
case 'D': case 'D':
sscanf_s( buffer, "CDown=%lu", &gController->stButtons.iCDown ); break; sscanf(buffer, "CDown=%lu", &gController->stButtons.iCDown); break;
case 'L': case 'L':
sscanf_s( buffer, "CLeft=%lu", &gController->stButtons.iCLeft ); break; sscanf(buffer, "CLeft=%lu", &gController->stButtons.iCLeft); break;
case 'R': case 'R':
sscanf_s( buffer, "CRight=%lu", &gController->stButtons.iCRight ); break; sscanf(buffer, "CRight=%lu", &gController->stButtons.iCRight); break;
} }
break; break;
case 'D': case 'D':
switch( buffer[1] ) switch( buffer[1] )
{ {
case 'U': case 'U':
sscanf_s( buffer, "DUp=%lu", &gController->stButtons.iDUp ); break; sscanf(buffer, "DUp=%lu", &gController->stButtons.iDUp); break;
case 'D': case 'D':
sscanf_s( buffer, "DDown=%lu", &gController->stButtons.iDDown ); break; sscanf(buffer, "DDown=%lu", &gController->stButtons.iDDown); break;
case 'L': case 'L':
sscanf_s( buffer, "DLeft=%lu", &gController->stButtons.iDLeft ); break; sscanf(buffer, "DLeft=%lu", &gController->stButtons.iDLeft); break;
case 'R': case 'R':
sscanf_s( buffer, "DRight=%lu", &gController->stButtons.iDRight ); break; sscanf(buffer, "DRight=%lu", &gController->stButtons.iDRight); break;
} }
break; break;
case 'L': case 'L':
switch( buffer[1] ) switch( buffer[1] )
{ {
case '=': case '=':
sscanf_s( buffer, "L=%lu", &gController->stButtons.iL ); break; sscanf(buffer, "L=%lu", &gController->stButtons.iL); break;
case 'e': case 'e':
switch( buffer[4] ) switch( buffer[4] )
{ {
case 'T': case 'T':
sscanf_s( buffer, "LeftTrigger=%lu", &gController->stAnalogs.iLeftTrigger ); break; sscanf(buffer, "LeftTrigger=%lu", &gController->stAnalogs.iLeftTrigger); break;
case 'X': case 'X':
sscanf_s( buffer, "LeftXAxis=%lu", &gController->stAnalogs.iLXAxis ); break; sscanf(buffer, "LeftXAxis=%lu", &gController->stAnalogs.iLXAxis); break;
case 'Y': case 'Y':
sscanf_s( buffer, "LeftYAxis=%lu", &gController->stAnalogs.iLYAxis ); break; sscanf(buffer, "LeftYAxis=%lu", &gController->stAnalogs.iLYAxis); break;
} }
break; break;
} }
@ -789,28 +789,28 @@ void LoadXInputConfigFromFile( FILE *file, LPXCONTROLLER gController )
switch( buffer[1] ) switch( buffer[1] )
{ {
case '=': case '=':
sscanf_s( buffer, "R=%lu", &gController->stButtons.iR ); break; sscanf(buffer, "R=%lu", &gController->stButtons.iR); break;
case 'i': case 'i':
switch( buffer[5] ) switch( buffer[5] )
{ {
case 'T': case 'T':
sscanf_s( buffer, "RightTrigger=%lu", &gController->stAnalogs.iRightTrigger ); break; sscanf(buffer, "RightTrigger=%lu", &gController->stAnalogs.iRightTrigger); break;
case 'X': case 'X':
sscanf_s( buffer, "RightXAxis=%lu", &gController->stAnalogs.iRXAxis ); break; sscanf(buffer, "RightXAxis=%lu", &gController->stAnalogs.iRXAxis); break;
case 'Y': case 'Y':
sscanf_s( buffer, "RightYAxis=%lu", &gController->stAnalogs.iRYAxis ); break; sscanf(buffer, "RightYAxis=%lu", &gController->stAnalogs.iRYAxis); break;
} }
break; break;
} }
break; break;
case 'Z': case 'Z':
sscanf_s( buffer, "Z=%lu", &gController->stButtons.iZ ); break; sscanf(buffer, "Z=%lu", &gController->stButtons.iZ); break;
case 'S': case 'S':
sscanf_s( buffer, "Start=%lu", &gController->stButtons.iStart ); break; sscanf(buffer, "Start=%lu", &gController->stButtons.iStart); break;
case 'X': case 'X':
sscanf_s( buffer, "XAxis=%lu", &gController->stButtons.iXAxis ); break; sscanf(buffer, "XAxis=%lu", &gController->stButtons.iXAxis); break;
case 'Y': case 'Y':
sscanf_s( buffer, "YAxis=%lu", &gController->stButtons.iYAxis ); break; sscanf(buffer, "YAxis=%lu", &gController->stButtons.iYAxis); break;
} }
} }