[Scummvm-cvs-logs] SF.net SVN: scummvm:[43570] scummvm/trunk/engines/gob/save
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Thu Aug 20 22:59:22 CEST 2009
Revision: 43570
http://scummvm.svn.sourceforge.net/scummvm/?rev=43570&view=rev
Author: drmccoy
Date: 2009-08-20 20:59:22 +0000 (Thu, 20 Aug 2009)
Log Message:
-----------
Fixing some signed/unsigned comparison warnings
Modified Paths:
--------------
scummvm/trunk/engines/gob/save/saveload_playtoons.cpp
scummvm/trunk/engines/gob/save/saveload_v2.cpp
scummvm/trunk/engines/gob/save/saveload_v3.cpp
scummvm/trunk/engines/gob/save/saveload_v4.cpp
scummvm/trunk/engines/gob/save/saveload_v6.cpp
Modified: scummvm/trunk/engines/gob/save/saveload_playtoons.cpp
===================================================================
--- scummvm/trunk/engines/gob/save/saveload_playtoons.cpp 2009-08-20 20:41:12 UTC (rev 43569)
+++ scummvm/trunk/engines/gob/save/saveload_playtoons.cpp 2009-08-20 20:59:22 UTC (rev 43570)
@@ -93,20 +93,20 @@
size = varSize;
}
- if (offset < kPropsSize) {
+ if (((uint32) offset) < kPropsSize) {
// Properties
- if ((offset + size) > kPropsSize) {
+ if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
_vm->_inter->_variables->copyFrom(dataVar, _props + offset, size);
- } else if (offset < kPropsSize + kIndexSize) {
+ } else if (((uint32) offset) < kPropsSize + kIndexSize) {
// Save index
- if (size != kIndexSize) {
+ if (((uint32) size) != kIndexSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
@@ -180,20 +180,20 @@
size = varSize;
}
- if (offset < kPropsSize) {
+ if (((uint32) offset) < kPropsSize) {
// Properties
- if ((offset + size) > kPropsSize) {
+ if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
_vm->_inter->_variables->copyTo(dataVar, _props + offset, size);
- } else if (offset < kPropsSize + kIndexSize) {
+ } else if (((uint32) offset) < kPropsSize + kIndexSize) {
// Save index
- if (size != kIndexSize) {
+ if (((uint32) size) != kIndexSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
Modified: scummvm/trunk/engines/gob/save/saveload_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/save/saveload_v2.cpp 2009-08-20 20:41:12 UTC (rev 43569)
+++ scummvm/trunk/engines/gob/save/saveload_v2.cpp 2009-08-20 20:59:22 UTC (rev 43570)
@@ -99,7 +99,7 @@
if (offset == 0) {
// Save index
- if (size != kIndexSize) {
+ if (((uint32) size) != kIndexSize) {
warning("Requested index has wrong size (%d)", size);
return false;
}
@@ -184,7 +184,7 @@
if (offset == 0) {
// Save index
- if (size != kIndexSize) {
+ if (((uint32) size) != kIndexSize) {
warning("Requested index has wrong size (%d)", size);
return false;
}
Modified: scummvm/trunk/engines/gob/save/saveload_v3.cpp
===================================================================
--- scummvm/trunk/engines/gob/save/saveload_v3.cpp 2009-08-20 20:41:12 UTC (rev 43569)
+++ scummvm/trunk/engines/gob/save/saveload_v3.cpp 2009-08-20 20:59:22 UTC (rev 43570)
@@ -119,22 +119,22 @@
size = varSize;
}
- if (offset < kPropsSize) {
+ if (((uint32) offset) < kPropsSize) {
// Global properties, like joker usage
debugC(3, kDebugSaveLoad, "Loading global properties");
- if ((size + offset) > kPropsSize) {
+ if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong global properties list size (%d, %d)", size, offset);
return false;
}
_vm->_inter->_variables->copyFrom(dataVar, _props + offset, size);
- } else if (offset == kPropsSize) {
+ } else if (((uint32) offset) == kPropsSize) {
// Save index
- if (size != kIndexSize) {
+ if (((uint32) size) != kIndexSize) {
warning("Requested index has wrong size (%d)", size);
return false;
}
@@ -193,22 +193,22 @@
size = varSize;
}
- if (offset < kPropsSize) {
+ if (((uint32) offset) < kPropsSize) {
// Global properties, like joker usage
debugC(3, kDebugSaveLoad, "Saving global properties");
- if ((size + offset) > kPropsSize) {
+ if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong global properties list size (%d, %d)", size, offset);
return false;
}
_vm->_inter->_variables->copyTo(dataVar, _props + offset, size);
- } else if (offset == kPropsSize) {
+ } else if (((uint32) offset) == kPropsSize) {
// Save index
- if (size != kIndexSize) {
+ if (((uint32) size) != kIndexSize) {
warning("Requested index has wrong size (%d)", size);
return false;
}
Modified: scummvm/trunk/engines/gob/save/saveload_v4.cpp
===================================================================
--- scummvm/trunk/engines/gob/save/saveload_v4.cpp 2009-08-20 20:41:12 UTC (rev 43569)
+++ scummvm/trunk/engines/gob/save/saveload_v4.cpp 2009-08-20 20:59:22 UTC (rev 43570)
@@ -127,22 +127,22 @@
size = varSize;
}
- if (offset < kPropsSize) {
+ if (((uint32) offset) < kPropsSize) {
// Global properties
debugC(3, kDebugSaveLoad, "Loading global properties");
- if ((size + offset) > kPropsSize) {
+ if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong global properties list size (%d, %d)", size, offset);
return false;
}
_vm->_inter->_variables->copyFrom(dataVar, _props + offset, size);
- } else if (offset == kPropsSize) {
+ } else if (((uint32) offset) == kPropsSize) {
// Save index
- if (size != kIndexSize) {
+ if (((uint32) size) != kIndexSize) {
warning("Requested index has wrong size (%d)", size);
return false;
}
@@ -202,22 +202,22 @@
size = varSize;
}
- if (offset < kPropsSize) {
+ if (((uint32) offset) < kPropsSize) {
// Global properties
debugC(3, kDebugSaveLoad, "Saving global properties");
- if ((size + offset) > kPropsSize) {
+ if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong global properties list size (%d, %d)", size, offset);
return false;
}
_vm->_inter->_variables->copyTo(dataVar, _props + offset, size);
- } else if (offset == kPropsSize) {
+ } else if (((uint32) offset) == kPropsSize) {
// Save index
- if (size != kIndexSize) {
+ if (((uint32) size) != kIndexSize) {
warning("Requested index has wrong size (%d)", size);
return false;
}
Modified: scummvm/trunk/engines/gob/save/saveload_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/save/saveload_v6.cpp 2009-08-20 20:41:12 UTC (rev 43569)
+++ scummvm/trunk/engines/gob/save/saveload_v6.cpp 2009-08-20 20:59:22 UTC (rev 43570)
@@ -95,22 +95,22 @@
size = varSize;
}
- if (offset < kPropsSize) {
+ if (((uint32) offset) < kPropsSize) {
// Properties
refreshProps();
- if ((offset + size) > kPropsSize) {
+ if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
_vm->_inter->_variables->copyFrom(dataVar, _props + offset, size);
- } else if (offset < kPropsSize + kIndexSize) {
+ } else if (((uint32) offset) < kPropsSize + kIndexSize) {
// Save index
- if (size != kIndexSize) {
+ if (((uint32) size) != kIndexSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
@@ -191,10 +191,10 @@
size = varSize;
}
- if (offset < kPropsSize) {
+ if (((uint32) offset) < kPropsSize) {
// Properties
- if ((offset + size) > kPropsSize) {
+ if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
@@ -203,10 +203,10 @@
refreshProps();
- } else if (offset < kPropsSize + kIndexSize) {
+ } else if (((uint32) offset) < kPropsSize + kIndexSize) {
// Save index
- if (size != kIndexSize) {
+ if (((uint32) size) != kIndexSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
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