mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-12 05:50:29 +02:00
NPDRM: Logging cleanup, remove assert (turn into debug assert)
This commit is contained in:
1 parent
6f9a6b0d6e
commit
2e53d2f9f9
2 files changed
+18
-24
No files matched your search
@@ -428,10 +428,12 @@ NPDRMDemoBlockDevice::NPDRMDemoBlockDevice(FileLoader *fileLoader)
|
||||
memcpy(psarStr, &psar_id, 4);
|
||||
|
||||
// Protect against a badly decrypted header, and send information through the assert about what's being played (implicitly).
|
||||
_assert_msg_(blockLBAs_ <= 4096, "Bad blockLBAs in header: %08x (%s) psar: %s", blockLBAs_, fileLoader->GetPath().ToVisualString().c_str(), psarStr);
|
||||
_dbg_assert_msg_(blockLBAs_ <= 4096, "Bad blockLBAs in header: %08x (%s) psar: %s", blockLBAs_, fileLoader->GetPath().ToVisualString().c_str(), psarStr);
|
||||
|
||||
// When we remove the above assert, let's just try to survive.
|
||||
if (blockLBAs_ > 4096) {
|
||||
ERROR_LOG(Log::Loader, "Bad blockLBAs in header: %08x (%s) psar: %s", blockLBAs_, fileLoader->GetPath().ToVisualString().c_str(), psarStr);
|
||||
// We'll end up displaying an error message since ReadBlock will fail.
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -447,7 +449,7 @@ NPDRMDemoBlockDevice::NPDRMDemoBlockDevice(FileLoader *fileLoader)
|
||||
table_ = new table_info[numBlocks_];
|
||||
|
||||
readSize = fileLoader_->ReadAt(psarOffset + tableOffset_, 1, tableSize_, table_);
|
||||
if (readSize!=tableSize_){
|
||||
if (readSize != tableSize_){
|
||||
ERROR_LOG(Log::Loader, "Invalid NPUMDIMG table!");
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user