Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Clean up some unused result warnings.

Browse Source
This commit is contained in:
Unknown W. Brackets 2016-05-31 11:49:59 -07:00
parent 25136eb019
commit 30e13c7c37
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Common/Misc.cpp
View File

@ -60,7 +60,9 @@ const char *GetStringErrorMsg(int errCode) {
static __thread char err_str[buff_size] = {};
// Thread safe (XSI-compliant)
strerror_r(errCode, err_str, buff_size);
if (strerror_r(errCode, err_str, buff_size) == 0) {
return "Unknown error";
}
#endif
return err_str;

25
ext/native/file/chunk_file.cpp
View File

@ -62,12 +62,12 @@ int ChunkFile::readInt() {
return *(int *)(data + pos - 4);
else {
int i;
fread(&i, 1, 4, file);
return i;
if (fread(&i, 1, 4, file) == 4) {
return i;
}
}
} else {
return 0;
}
return 0;
}
void ChunkFile::writeInt(int i) {
@ -166,18 +166,23 @@ void ChunkFile::ascend() {
//read a block
void ChunkFile::readData(void *what, int count) {
if (fastMode)
if (fastMode) {
memcpy(what, data + pos, count);
else
fread(what, 1, count, file);
} else {
if (fread(what, 1, count, file) != count) {
ELOG("Failed to read complete %d bytes", count);
}
}
pos+=count;
char temp[4]; //discarded
count &= 3;
if (count) {
count=4-count;
if (!fastMode)
fread(temp, 1, count, file); // could just as well seek
if (!fastMode) {
if (fseek(file, count, SEEK_CUR) != 0) {
ELOG("Missing padding");
}
}
pos+=count;
}
}