[Scummvm-cvs-logs] SF.net SVN: scummvm:[47427] scummvm/trunk
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Fri Jan 22 00:05:50 CET 2010
Revision: 47427
http://scummvm.svn.sourceforge.net/scummvm/?rev=47427&view=rev
Author: eriktorbjorn
Date: 2010-01-21 23:05:33 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
Silenced some cppcheck warnings.
Modified Paths:
--------------
scummvm/trunk/base/plugins.cpp
scummvm/trunk/engines/agi/console.cpp
scummvm/trunk/engines/agi/sound.cpp
scummvm/trunk/engines/agi/wagparser.cpp
scummvm/trunk/engines/parallaction/debug.cpp
scummvm/trunk/engines/saga/saveload.cpp
scummvm/trunk/engines/sword2/sprite.cpp
Modified: scummvm/trunk/base/plugins.cpp
===================================================================
--- scummvm/trunk/base/plugins.cpp 2010-01-21 22:50:56 UTC (rev 47426)
+++ scummvm/trunk/base/plugins.cpp 2010-01-21 23:05:33 UTC (rev 47427)
@@ -234,7 +234,7 @@
pluginDirs.push_back(Common::FSNode(pluginsPath));
Common::FSList::const_iterator dir;
- for (dir = pluginDirs.begin(); dir != pluginDirs.end(); dir++) {
+ for (dir = pluginDirs.begin(); dir != pluginDirs.end(); ++dir) {
// Load all plugins.
// Scan for all plugins in this directory
Common::FSList files;
Modified: scummvm/trunk/engines/agi/console.cpp
===================================================================
--- scummvm/trunk/engines/agi/console.cpp 2010-01-21 22:50:56 UTC (rev 47426)
+++ scummvm/trunk/engines/agi/console.cpp 2010-01-21 23:05:33 UTC (rev 47427)
@@ -257,7 +257,7 @@
int num;
Common::Array<ScriptPos>::iterator it;
- for (it = _vm->_game.execStack.begin(); it != _vm->_game.execStack.end(); it++) {
+ for (it = _vm->_game.execStack.begin(); it != _vm->_game.execStack.end(); ++it) {
code = _vm->_game.logics[it->script].data;
op = code[it->curIP];
num = logicNamesCmd[op].numArgs;
Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp 2010-01-21 22:50:56 UTC (rev 47426)
+++ scummvm/trunk/engines/agi/sound.cpp 2010-01-21 23:05:33 UTC (rev 47427)
@@ -428,7 +428,7 @@
void IIgsSoundMgr::stopSounds() {
// Stops all sounds on all MIDI channels
- for (iterator iter = _midiChannels.begin(); iter != _midiChannels.end(); iter++)
+ for (iterator iter = _midiChannels.begin(); iter != _midiChannels.end(); ++iter)
iter->stopSounds();
}
@@ -445,7 +445,7 @@
void IIgsMidiChannel::stopSounds() {
// Stops all sounds on this single MIDI channel
- for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); iter++)
+ for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); ++iter)
iter->stop();
_gsChannels.clear();
@@ -690,7 +690,7 @@
}
void IIgsSoundMgr::removeStoppedSounds() {
- for (Common::Array<IIgsMidiChannel>::iterator iter = _midiChannels.begin(); iter != _midiChannels.end(); iter++)
+ for (Common::Array<IIgsMidiChannel>::iterator iter = _midiChannels.begin(); iter != _midiChannels.end(); ++iter)
iter->removeStoppedSounds();
}
@@ -703,7 +703,7 @@
uint IIgsSoundMgr::activeSounds() const {
uint result = 0;
- for (Common::Array<IIgsMidiChannel>::const_iterator iter = _midiChannels.begin(); iter != _midiChannels.end(); iter++)
+ for (Common::Array<IIgsMidiChannel>::const_iterator iter = _midiChannels.begin(); iter != _midiChannels.end(); ++iter)
result += iter->activeSounds();
return result;
@@ -712,7 +712,7 @@
uint IIgsMidiChannel::activeSounds() const {
uint result = 0;
- for (const_iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); iter++)
+ for (const_iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); ++iter)
if (!iter->end)
result++;
@@ -724,7 +724,7 @@
_sample = sample;
// Set program on each Apple IIGS channel playing on this MIDI channel
- for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); iter++)
+ for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); ++iter)
iter->setInstrument(instrument, sample);
}
@@ -732,14 +732,14 @@
_volume = volume;
// Set volume on each Apple IIGS channel playing on this MIDI channel
- for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); iter++)
+ for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); ++iter)
iter->setChannelVolume(volume);
}
void IIgsMidiChannel::noteOff(uint8 note, uint8 velocity) {
// Go through all the notes playing on this MIDI channel
// and turn off the ones that are playing the given note
- for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); iter++)
+ for (iterator iter = _gsChannels.begin(); iter != _gsChannels.end(); ++iter)
if (iter->origNote == note)
iter->noteOff(velocity);
}
@@ -1195,7 +1195,7 @@
fsnodeNameEqualsIgnoreCase(const Common::StringList &str) : _str(str) {}
fsnodeNameEqualsIgnoreCase(const Common::String str) { _str.push_back(str); }
bool operator()(const Common::FSNode ¶m) const {
- for (Common::StringList::const_iterator iter = _str.begin(); iter != _str.end(); iter++)
+ for (Common::StringList::const_iterator iter = _str.begin(); iter != _str.end(); ++iter)
if (param.getName().equalsIgnoreCase(*iter))
return true;
return false;
Modified: scummvm/trunk/engines/agi/wagparser.cpp
===================================================================
--- scummvm/trunk/engines/agi/wagparser.cpp 2010-01-21 22:50:56 UTC (rev 47426)
+++ scummvm/trunk/engines/agi/wagparser.cpp 2010-01-21 23:05:33 UTC (rev 47427)
@@ -213,7 +213,7 @@
}
const WagProperty *WagFileParser::getProperty(const WagProperty::WagPropertyCode code) const {
- for (PropertyList::const_iterator iter = _propList.begin(); iter != _propList.end(); iter++)
+ for (PropertyList::const_iterator iter = _propList.begin(); iter != _propList.end(); ++iter)
if (iter->getCode() == code) return iter;
return NULL;
}
Modified: scummvm/trunk/engines/parallaction/debug.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/debug.cpp 2010-01-21 22:50:56 UTC (rev 47426)
+++ scummvm/trunk/engines/parallaction/debug.cpp 2010-01-21 23:05:33 UTC (rev 47427)
@@ -158,7 +158,7 @@
DebugPrintf("+--------------------+---+---+---+---+--------+--------+\n"
"| name | l | t | r | b | type | flag |\n"
"+--------------------+---+---+---+---+--------+--------+\n");
- for ( ; b != e; b++) {
+ for ( ; b != e; ++b) {
ZonePtr z = *b;
z->getRect(r);
DebugPrintf("|%-20s|%3i|%3i|%3i|%3i|%8x|%8x|\n", z->_name, r.left, r.top, r.right, r.bottom, z->_type, z->_flags );
@@ -237,7 +237,7 @@
DebugPrintf("+--------------------+----+----+----+---+--------+----------------------------------------+\n"
"| name | x | y | z | f | type | flags | \n"
"+--------------------+----+----+----+---+--------+----------------------------------------+\n");
- for ( ; b != e; b++) {
+ for ( ; b != e; ++b) {
AnimationPtr a = *b;
flags = decodeZoneFlags(a->_flags);
DebugPrintf("|%-20s|%4i|%4i|%4i|%3i|%8x|%-40s|\n", a->_name, a->getX(), a->getY(), a->getZ(), a->getF(), a->_type, flags.c_str() );
@@ -260,7 +260,7 @@
GfxObjArray::iterator e = _vm->_gfx->_sceneObjects.end();
Common::Rect r;
- for ( ; b != e; b++) {
+ for ( ; b != e; ++b) {
GfxObj *obj = *b;
obj->getRect(obj->frame, r);
DebugPrintf("|%-20s|%5i|%5i|%5i|%5i|%5i|%7i|%5i|%8s|\n", obj->getName(), r.left, r.top, r.width(), r.height(),
Modified: scummvm/trunk/engines/saga/saveload.cpp
===================================================================
--- scummvm/trunk/engines/saga/saveload.cpp 2010-01-21 22:50:56 UTC (rev 47426)
+++ scummvm/trunk/engines/saga/saveload.cpp 2010-01-21 23:05:33 UTC (rev 47427)
@@ -136,7 +136,7 @@
_saveFilesCount = 0;
- for (Common::StringList::iterator file = filenames.begin(); file != filenames.end(); file++){
+ for (Common::StringList::iterator file = filenames.begin(); file != filenames.end(); ++file){
//Obtain the last 2 digits of the filename, since they correspond to the save slot
slot[0] = file->c_str()[file->size()-2];
slot[1] = file->c_str()[file->size()-1];
Modified: scummvm/trunk/engines/sword2/sprite.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sprite.cpp 2010-01-21 22:50:56 UTC (rev 47426)
+++ scummvm/trunk/engines/sword2/sprite.cpp 2010-01-21 23:05:33 UTC (rev 47427)
@@ -538,8 +538,11 @@
unwindRaw16(tempBuf2, tempBuf, (s->w * (s->h / 2)), s->colourTable);
sprite = (byte *)malloc(s->w * s->h);
- if (!sprite)
+ if (!sprite) {
+ free(tempBuf2);
+ free(tempBuf);
return RDERR_OUTOFMEMORY;
+ }
resizePsxSprite(sprite, tempBuf2, s->w, s->h);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list