aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/ds
diff options
context:
space:
mode:
authorMax Horn2010-07-05 16:12:31 +0000
committerMax Horn2010-07-05 16:12:31 +0000
commit75529dc4022ec52ffba971d532c397aa951c2d5c (patch)
treebbc192b2c92788843f096b7d5dce8da650925d50 /backends/platform/ds
parentedb5210d382d27c31cca0a48a427735044078ba4 (diff)
downloadscummvm-rg350-75529dc4022ec52ffba971d532c397aa951c2d5c.tar.gz
scummvm-rg350-75529dc4022ec52ffba971d532c397aa951c2d5c.tar.bz2
scummvm-rg350-75529dc4022ec52ffba971d532c397aa951c2d5c.zip
DS: Fix various warnings and errors in the DS FS code
* Do not modify the strings passed to std_fopen anymore * Correct signature of std_fread * Do not cast away constness, nor perform unnecessary casts svn-id: r50693
Diffstat (limited to 'backends/platform/ds')
-rw-r--r--backends/platform/ds/arm9/source/cdaudio.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/backends/platform/ds/arm9/source/cdaudio.cpp b/backends/platform/ds/arm9/source/cdaudio.cpp
index 28d9819991..66fbef6cdc 100644
--- a/backends/platform/ds/arm9/source/cdaudio.cpp
+++ b/backends/platform/ds/arm9/source/cdaudio.cpp
@@ -162,7 +162,7 @@ void playTrack(int track, int numLoops, int startFrame, int duration) {
}
- DS::std_fread((const void *) &waveHeader, sizeof(waveHeader), 1, file);
+ DS::std_fread(&waveHeader, sizeof(waveHeader), 1, file);
consolePrintf("File: %s\n", fname.c_str());
@@ -186,11 +186,11 @@ void playTrack(int track, int numLoops, int startFrame, int duration) {
// Skip chunks until we reach the data chunk
chunkHeader chunk;
- DS::std_fread((const void *) &chunk, sizeof(chunkHeader), 1, file);
+ DS::std_fread(&chunk, sizeof(chunkHeader), 1, file);
while (!((chunk.name[0] == 'd') && (chunk.name[1] == 'a') && (chunk.name[2] == 't') && (chunk.name[3] == 'a'))) {
DS::std_fseek(file, chunk.size, SEEK_CUR);
- DS::std_fread((const void *) &chunk, sizeof(chunkHeader), 1, file);
+ DS::std_fread(&chunk, sizeof(chunkHeader), 1, file);
}
dataChunkStart = DS::std_ftell(file);
@@ -266,7 +266,7 @@ void decompressBlock() {
do {
- DS::std_fread((const void *) &blockHeader, sizeof(blockHeader), 1, file);
+ DS::std_fread(&blockHeader, sizeof(blockHeader), 1, file);
DS::std_fread(&block[0], waveHeader.fmtBlockAlign - sizeof(blockHeader), 1, file);