mirror of
https://github.com/scummvm/scummvm.git
synced 2026-05-21 05:40:43 +00:00
JANITORIAL: Fix compiler warnings
In member function 'MidiParser_HMP::HmpVersion MidiParser_HMP::determineVersion(const byte*)',
inlined from 'virtual int32 MidiParser_HMP::determineDataSize(Common::SeekableReadStream*)' at audio/midiparser_hmp.cpp:132:39:
audio/midiparser_hmp.cpp:161:129: warning: 'versionBytes' may be used uninitialized [-Wmaybe-uninitialized]
161 | warning("Unknown HMP version '%c%c%c%c%c%c' - assuming version 1", pos[0], pos[1], pos[2], pos[3], pos[4], pos[5]);
| ~~~~~^
audio/midiparser_hmp.cpp: In member function 'virtual int32 MidiParser_HMP::determineDataSize(Common::SeekableReadStream*)':
audio/midiparser_hmp.cpp:130:14: note: 'versionBytes' declared here
130 | byte versionBytes[6];
| ^~~~~~~~~~~~
gui/widgets/list.cpp: In member function 'void GUI::ListWidget::addSelectedItem(int)':
gui/widgets/list.cpp:228:27: warning: comparison of integer expressions of different signedness: 'int' and 'Common::Array<int>::size_type' {aka 'unsigned int'} [-Wsign-compare]
228 | for (int i = 0; i < _selectedItems.size(); ++i) {
| ~~^~~~~~~~~~~~~~~~~~~~~~~
gui/widgets/list.cpp: In member function 'void GUI::ListWidget::removeSelectedItem(int)':
gui/widgets/list.cpp:248:27: warning: comparison of integer expressions of different signedness: 'int' and 'Common::Array<int>::size_type' {aka 'unsigned int'} [-Wsign-compare]
248 | for (int i = 0; i < _selectedItems.size(); ++i) {
| ~~^~~~~~~~~~~~~~~~~~~~~~~
This commit is contained in:
@@ -127,7 +127,7 @@ int32 MidiParser_HMP::determineDataSize(Common::SeekableReadStream *stream) {
|
||||
if (strcmp(stream->readString('\x00', 8).c_str(), HMP_HEADER)) {
|
||||
return -1;
|
||||
}
|
||||
byte versionBytes[6];
|
||||
byte versionBytes[6] = {0};
|
||||
stream->readMultipleLE(*versionBytes);
|
||||
HmpVersion version = determineVersion(versionBytes);
|
||||
stream->skip(18);
|
||||
|
||||
@@ -225,7 +225,7 @@ void ListWidget::addSelectedItem(int item) {
|
||||
|
||||
// Insert in ascending order to keep selection sorted
|
||||
bool inserted = false;
|
||||
for (int i = 0; i < _selectedItems.size(); ++i) {
|
||||
for (size_t i = 0; i < _selectedItems.size(); ++i) {
|
||||
if (_selectedItems[i] > actualItem) {
|
||||
_selectedItems.insert_at(i, actualItem);
|
||||
inserted = true;
|
||||
@@ -245,7 +245,7 @@ void ListWidget::removeSelectedItem(int item) {
|
||||
actualItem = _listIndex[item];
|
||||
}
|
||||
|
||||
for (int i = 0; i < _selectedItems.size(); ++i) {
|
||||
for (size_t i = 0; i < _selectedItems.size(); ++i) {
|
||||
if (_selectedItems[i] == actualItem) {
|
||||
_selectedItems.remove_at(i);
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user