Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-08-15 11:27:35 +00:00
Code Issues Projects Releases Wiki Activity

dangling elses

Browse Source 
../extfs.cpp:1700:5: warning: add explicit braces to avoid dangling else [-Wdangling-else]
                } else
                  ^
../extfs.cpp:1735:3: warning: add explicit braces to avoid dangling else [-Wdangling-else]
                else
                ^
../extfs.cpp:1773:5: warning: add explicit braces to avoid dangling else [-Wdangling-else]
                } else
                  ^
../extfs.cpp:1799:5: warning: add explicit braces to avoid dangling else [-Wdangling-else]
                } else
                  ^
../extfs.cpp:1845:5: warning: add explicit braces to avoid dangling else [-Wdangling-else]
                } else
                  ^
../extfs.cpp:1898:5: warning: add explicit braces to avoid dangling else [-Wdangling-else]
                } else
                  ^
6 warnings generated.
This commit is contained in:
Amadeusz Sławiński
2012-06-21 14:54:47 +02:00
committed by Alexei Svitkine
parent a40257b33a
commit 9b896b12bb
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
BasiliskII/src/extfs.cpp
View File

@@ -1693,12 +1693,13 @@ static int16 fs_get_eof(uint32 pb)
if (ReadMacInt32(fcb + fcbFlNm) == 0)
return fnOpnErr;
int fd = ReadMacInt32(fcb + fcbCatPos);
if (fd < 0)
if (fd < 0) {
if (ReadMacInt8(fcb + fcbFlags) & fcbResourceMask) { // "pseudo" resource fork
WriteMacInt32(pb + ioMisc, 0);
return noErr;
} else
return fnOpnErr;
}
// Get file size
struct stat st;
@@ -1729,11 +1730,12 @@ static int16 fs_set_eof(uint32 pb)
if (ReadMacInt32(fcb + fcbFlNm) == 0)
return fnOpnErr;
int fd = ReadMacInt32(fcb + fcbCatPos);
if (fd < 0)
if (fd < 0) {
if (ReadMacInt8(fcb + fcbFlags) & fcbResourceMask) // "pseudo" resource fork
return noErr;
else
return fnOpnErr;
}
// Truncate file
uint32 size = ReadMacInt32(pb + ioMisc);
@@ -1766,12 +1768,13 @@ static int16 fs_get_fpos(uint32 pb)
if (ReadMacInt32(fcb + fcbFlNm) == 0)
return fnOpnErr;
int fd = ReadMacInt32(fcb + fcbCatPos);
if (fd < 0)
if (fd < 0) {
if (ReadMacInt8(fcb + fcbFlags) & fcbResourceMask) { // "pseudo" resource fork
WriteMacInt32(pb + ioPosOffset, 0);
return noErr;
} else
return fnOpnErr;
}
// Get file position
uint32 pos = lseek(fd, 0, SEEK_CUR);
@@ -1792,12 +1795,13 @@ static int16 fs_set_fpos(uint32 pb)
if (ReadMacInt32(fcb + fcbFlNm) == 0)
return fnOpnErr;
int fd = ReadMacInt32(fcb + fcbCatPos);
if (fd < 0)
if (fd < 0) {
if (ReadMacInt8(fcb + fcbFlags) & fcbResourceMask) { // "pseudo" resource fork
WriteMacInt32(pb + ioPosOffset, 0);
return noErr;
} else
return fnOpnErr;
}
// Set file position
switch (ReadMacInt16(pb + ioPosMode) & 3) {
@@ -1838,12 +1842,13 @@ static int16 fs_read(uint32 pb)
if (ReadMacInt32(fcb + fcbFlNm) == 0)
return fnOpnErr;
int fd = ReadMacInt32(fcb + fcbCatPos);
if (fd < 0)
if (fd < 0) {
if (ReadMacInt8(fcb + fcbFlags) & fcbResourceMask) { // "pseudo" resource fork
WriteMacInt32(pb + ioActCount, 0);
return eofErr;
} else
return fnOpnErr;
}
// Seek
switch (ReadMacInt16(pb + ioPosMode) & 3) {
@@ -1891,12 +1896,13 @@ static int16 fs_write(uint32 pb)
if (ReadMacInt32(fcb + fcbFlNm) == 0)
return fnOpnErr;
int fd = ReadMacInt32(fcb + fcbCatPos);
if (fd < 0)
if (fd < 0) {
if (ReadMacInt8(fcb + fcbFlags) & fcbResourceMask) { // "pseudo" resource fork
WriteMacInt32(pb + ioActCount, ReadMacInt32(pb + ioReqCount));
return noErr;
} else
return fnOpnErr;
}
// Seek
switch (ReadMacInt16(pb + ioPosMode) & 3) {