aboutsummaryrefslogtreecommitdiff
path: root/backends/plugins/mips-loader.cpp
diff options
context:
space:
mode:
authorAndre Heider2010-09-05 12:37:59 +0000
committerAndre Heider2010-09-05 12:37:59 +0000
commit253a0aa7f9756a16d4c6490cebba623b9352b945 (patch)
treef72be07557d966b9a4720319d206dc7bc5a71d57 /backends/plugins/mips-loader.cpp
parent07e3a422245e0fb118323ef95f354b81669231d3 (diff)
downloadscummvm-rg350-253a0aa7f9756a16d4c6490cebba623b9352b945.tar.gz
scummvm-rg350-253a0aa7f9756a16d4c6490cebba623b9352b945.tar.bz2
scummvm-rg350-253a0aa7f9756a16d4c6490cebba623b9352b945.zip
PLUGINS: Fix warnings.
svn-id: r52548
Diffstat (limited to 'backends/plugins/mips-loader.cpp')
-rw-r--r--backends/plugins/mips-loader.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/backends/plugins/mips-loader.cpp b/backends/plugins/mips-loader.cpp
index 67e12949d8..5a0db74041 100644
--- a/backends/plugins/mips-loader.cpp
+++ b/backends/plugins/mips-loader.cpp
@@ -39,7 +39,7 @@
*
*/
bool MIPSDLObject::relocate(Common::SeekableReadStream* DLFile, unsigned long offset, unsigned long size, void *relSegment) {
- Elf32_Rel *rel = NULL; // relocation entry
+ Elf32_Rel *rel = 0; // relocation entry
// Allocate memory for relocation table
if (!(rel = (Elf32_Rel *)malloc(size))) {
@@ -48,8 +48,8 @@ bool MIPSDLObject::relocate(Common::SeekableReadStream* DLFile, unsigned long of
}
// Read in our relocation table
- if (DLFile->seek(offset, SEEK_SET) < 0 ||
- DLFile->read(rel, size) != (ssize_t)size) {
+ if (!DLFile->seek(offset, SEEK_SET) ||
+ DLFile->read(rel, size) != size) {
warning("elfloader: Relocation table load failed.");
free(rel);
return false;
@@ -317,8 +317,8 @@ bool MIPSDLObject::loadSegment(Common::SeekableReadStream* DLFile, Elf32_Phdr *p
debug(2, "elfloader: Reading the segment into memory");
// Read the segment into memory
- if (DLFile->seek(phdr->p_offset, SEEK_SET) < 0 ||
- DLFile->read(baseAddress, phdr->p_filesz) != (ssize_t)phdr->p_filesz) {
+ if (!DLFile->seek(phdr->p_offset, SEEK_SET) ||
+ DLFile->read(baseAddress, phdr->p_filesz) != phdr->p_filesz) {
warning("elfloader: Segment load failed.");
return false;
}
@@ -332,11 +332,11 @@ bool MIPSDLObject::loadSegment(Common::SeekableReadStream* DLFile, Elf32_Phdr *p
void MIPSDLObject::unload() {
discard_symtab();
free(_segment);
- _segment = NULL;
+ _segment = 0;
if (_shortsSegment) {
ShortsMan.deleteSegment(_shortsSegment);
- _shortsSegment = NULL;
+ _shortsSegment = 0;
}
}