From c1e701a2e54d61e2da26b95346011393895494d5 Mon Sep 17 00:00:00 2001
From: georgemoralis <giorgosmrls@gmail.com>
Date: Thu, 29 Feb 2024 16:22:01 +0200
Subject: [PATCH] small fixes

---
 src/core/file_format/pkg.cpp | 4 ++--
 src/core/loader.cpp          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/file_format/pkg.cpp b/src/core/file_format/pkg.cpp
index 4a40f40d5..cdb36f538 100644
--- a/src/core/file_format/pkg.cpp
+++ b/src/core/file_format/pkg.cpp
@@ -166,7 +166,7 @@ bool PKG::Extract(const std::string& filepath, const std::filesystem::path& extr
     // Read the seed
     std::array<CryptoPP::byte, 16> seed;
     file.Seek(pkgheader.pfs_image_offset + 0x370);
-    file.ReadRaw<u8>(seed.data(), seed.size());
+    file.Read(seed);
 
     // Get data and tweak keys.
     PKG::crypto.PfsGenCryptoKey(ekpfsKey, seed, dataKey, tweakKey);
@@ -347,7 +347,7 @@ void PKG::ExtractFiles(const int& index) {
             int previousData = (sectorOffset + pfsc_offset) - sectorOffsetMask;
 
             pkgFile.Seek(fileOffset - previousData);
-            pkgFile.ReadRaw<u8>(pfsc.data(), pfsc.size());
+            pkgFile.Read(pfsc);
 
             PKG::crypto.decryptPFS(dataKey, tweakKey, pfsc, pfs_decrypted, currentSector1);
 
diff --git a/src/core/loader.cpp b/src/core/loader.cpp
index 117ea2670..05075ca05 100644
--- a/src/core/loader.cpp
+++ b/src/core/loader.cpp
@@ -8,7 +8,7 @@
 FileTypes DetectFileType(const std::string& filepath) {
     if (filepath.size() == 0) // no file loaded
     {
-        return FILETYPE_UNKNOWN;
+        return FileTypes::Unknown;
     }
     Common::FS::IOFile file;
     file.Open(filepath, Common::FS::FileAccessMode::Read);
@@ -18,7 +18,7 @@ FileTypes DetectFileType(const std::string& filepath) {
     file.Close();
     switch (magic) {
     case 0x544e437f: // PS4 PKG
-        return FILETYPE_PKG;
+        return FileTypes::Pkg;
     }
-    return FILETYPE_UNKNOWN;
+    return FileTypes::Unknown;
 }