OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Abstract away file writing logic

Browse Source
This commit is contained in:
Adubbz
2019-08-07 20:43:48 +10:00
parent fac8acebba
commit 7dce15bcda
3 changed files with 26 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
stratosphere/ncm/source/ncm_contentstorage.cpp
View File

@@ -157,27 +157,7 @@ namespace sts::ncm {
this->placeholder_accessor.StoreToCache(f, placeholder_id);
};
if (fseek(f, 0, SEEK_END) != 0) {
return fsdevGetLastResult();
}
u64 size = ftell(f);
/* We can't disable append with stdio, so check this manually. */
if (offset + data.num_elements > size) {
return ResultFileExtensionWithoutOpenModeAllowAppend;
}
if (fseek(f, offset, SEEK_SET) != 0) {
return fsdevGetLastResult();
}
if (fwrite(data.buffer, sizeof(u8), data.num_elements, f) != data.num_elements) {
return fsdevGetLastResult();
}
if (!this->placeholder_accessor.delay_flush) {
fflush(f);
}
R_TRY(WriteFile(f, offset, data.buffer, data.num_elements, !this->placeholder_accessor.delay_flush));
return ResultSuccess;
R_DEBUG_END
@@ -601,25 +581,7 @@ namespace sts::ncm {
fclose(f);
};
if (fseek(f, 0, SEEK_END) != 0) {
return fsdevGetLastResult();
}
u64 size = ftell(f);
/* We can't disable append with stdio, so check this manually. */
if (offset + data.num_elements > size) {
return ResultFileExtensionWithoutOpenModeAllowAppend;
}
if (fseek(f, offset, SEEK_SET) != 0) {
return fsdevGetLastResult();
}
if (fwrite(data.buffer, sizeof(u8), data.num_elements, f) != data.num_elements) {
return fsdevGetLastResult();
}
fflush(f);
R_TRY(WriteFile(f, offset, data.buffer, data.num_elements, FS_WRITEOPTION_FLUSH));
return ResultSuccess;
R_DEBUG_END