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

Merge pull request #5555 from JosJuice/ub-string-comparisons 

Fix UB string comparisons
This commit is contained in:
shuffle2 2017-06-06 00:40:23 -07:00 committed by GitHub
parent c34c0db2a1 d41bb375f1
commit 4e0b44a188
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Core/HW/GCPadEmu.cpp
View File

@ -49,11 +49,12 @@ GCPad::GCPad(const unsigned int index) : m_index(index)
{ {
// buttons // buttons
groups.emplace_back(m_buttons = new ControllerEmu::Buttons(_trans("Buttons"))); groups.emplace_back(m_buttons = new ControllerEmu::Buttons(_trans("Buttons")));
for (unsigned int i = 0; i < sizeof(named_buttons) / sizeof(*named_buttons); ++i) for (const char* named_button : named_buttons)
{ {
const std::string& ui_name =
// i18n: The START/PAUSE button on GameCube controllers // i18n: The START/PAUSE button on GameCube controllers
const std::string& ui_name = (named_buttons[i] == "Start") ? _trans("START") : named_buttons[i]; (named_button == std::string("Start")) ? _trans("START") : named_button;
m_buttons->controls.emplace_back(new ControllerEmu::Input(named_buttons[i], ui_name)); m_buttons->controls.emplace_back(new ControllerEmu::Input(named_button, ui_name));
} }
// sticks // sticks
@ -64,7 +65,7 @@ GCPad::GCPad(const unsigned int index) : m_index(index)
// triggers // triggers
groups.emplace_back(m_triggers = new ControllerEmu::MixedTriggers(_trans("Triggers"))); groups.emplace_back(m_triggers = new ControllerEmu::MixedTriggers(_trans("Triggers")));
for (auto& named_trigger : named_triggers) for (const char* named_trigger : named_triggers)
m_triggers->controls.emplace_back(new ControllerEmu::Input(named_trigger)); m_triggers->controls.emplace_back(new ControllerEmu::Input(named_trigger));
// rumble // rumble
@ -77,7 +78,7 @@ GCPad::GCPad(const unsigned int index) : m_index(index)
// dpad // dpad
groups.emplace_back(m_dpad = new ControllerEmu::Buttons(_trans("D-Pad"))); groups.emplace_back(m_dpad = new ControllerEmu::Buttons(_trans("D-Pad")));
for (auto& named_direction : named_directions) for (const char* named_direction : named_directions)
m_dpad->controls.emplace_back(new ControllerEmu::Input(named_direction)); m_dpad->controls.emplace_back(new ControllerEmu::Input(named_direction));
// options // options

12
Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp
View File

@ -63,10 +63,10 @@ Classic::Classic(ExtensionReg& reg) : Attachment(_trans("Classic"), reg)
{ {
// buttons // buttons
groups.emplace_back(m_buttons = new ControllerEmu::Buttons(_trans("Buttons"))); groups.emplace_back(m_buttons = new ControllerEmu::Buttons(_trans("Buttons")));
for (auto& classic_button_name : classic_button_names) for (const char* button_name : classic_button_names)
{ {
const std::string& ui_name = (classic_button_name == "Home") ? "HOME" : classic_button_name; const std::string& ui_name = (button_name == std::string("Home")) ? "HOME" : button_name;
m_buttons->controls.emplace_back(new ControllerEmu::Input(classic_button_name, ui_name)); m_buttons->controls.emplace_back(new ControllerEmu::Input(button_name, ui_name));
} }
// sticks // sticks
@ -77,12 +77,12 @@ Classic::Classic(ExtensionReg& reg) : Attachment(_trans("Classic"), reg)
// triggers // triggers
groups.emplace_back(m_triggers = new ControllerEmu::MixedTriggers(_trans("Triggers"))); groups.emplace_back(m_triggers = new ControllerEmu::MixedTriggers(_trans("Triggers")));
for (auto& classic_trigger_name : classic_trigger_names) for (const char* trigger_name : classic_trigger_names)
m_triggers->controls.emplace_back(new ControllerEmu::Input(classic_trigger_name)); m_triggers->controls.emplace_back(new ControllerEmu::Input(trigger_name));
// dpad // dpad
groups.emplace_back(m_dpad = new ControllerEmu::Buttons(_trans("D-Pad"))); groups.emplace_back(m_dpad = new ControllerEmu::Buttons(_trans("D-Pad")));
for (auto& named_direction : named_directions) for (const char* named_direction : named_directions)
m_dpad->controls.emplace_back(new ControllerEmu::Input(named_direction)); m_dpad->controls.emplace_back(new ControllerEmu::Input(named_direction));
// Set up register // Set up register

6
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -256,9 +256,9 @@ Wiimote::Wiimote(const unsigned int index)
// buttons // buttons
groups.emplace_back(m_buttons = new ControllerEmu::Buttons(_trans("Buttons"))); groups.emplace_back(m_buttons = new ControllerEmu::Buttons(_trans("Buttons")));
for (auto& named_button : named_buttons) for (const char* named_button : named_buttons)
{ {
const std::string& ui_name = (named_button == "Home") ? "HOME" : named_button; const std::string& ui_name = (named_button == std::string("Home")) ? "HOME" : named_button;
m_buttons->controls.emplace_back(new ControllerEmu::Input(named_button, ui_name)); m_buttons->controls.emplace_back(new ControllerEmu::Input(named_button, ui_name));
} }
@ -299,7 +299,7 @@ Wiimote::Wiimote(const unsigned int index)
// dpad // dpad
groups.emplace_back(m_dpad = new ControllerEmu::Buttons(_trans("D-Pad"))); groups.emplace_back(m_dpad = new ControllerEmu::Buttons(_trans("D-Pad")));
for (auto& named_direction : named_directions) for (const char* named_direction : named_directions)
m_dpad->controls.emplace_back(new ControllerEmu::Input(named_direction)); m_dpad->controls.emplace_back(new ControllerEmu::Input(named_direction));
// options // options