aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar bunnei <bunneidev@gmail.com>2015-01-30 13:57:08 -0500
committerGravatar bunnei <bunneidev@gmail.com>2015-01-30 13:57:08 -0500
commitc8c3a94b208dd000561eb77d6ab0e585f236a73d (patch)
tree4d1a5ccf5afa0f2e1430fd0eb701fb06187bb733
parent28702cbfeb1fe21109f8b1efa189785594319b78 (diff)
parent0c4685ca12b091220f62f800474fd25a2a39d1ad (diff)
Merge pull request #511 from lioncash/warnings
Fix a few warnings.
-rw-r--r--src/core/hle/service/apt_u.cpp4
-rw-r--r--src/core/hle/service/fs/archive.cpp2
-rw-r--r--src/core/loader/loader.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/apt_u.cpp b/src/core/hle/service/apt_u.cpp
index 629b670e..4c3f621d 100644
--- a/src/core/hle/service/apt_u.cpp
+++ b/src/core/hle/service/apt_u.cpp
@@ -373,7 +373,7 @@ void SetAppCpuTimeLimit(Service::Interface* self) {
u32 percent = cmd_buff[2];
if (value != 1) {
- LOG_ERROR(Service_APT, "This value must be one!", value);
+ LOG_ERROR(Service_APT, "This value should be one, but is actually %u!", value);
}
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
@@ -395,7 +395,7 @@ void GetAppCpuTimeLimit(Service::Interface* self) {
u32 value = cmd_buff[1];
if (value != 1) {
- LOG_ERROR(Service_APT, "This value must be one!", value);
+ LOG_ERROR(Service_APT, "This value should be one, but is actually %u!", value);
}
// TODO(purpasmart96): This is incorrect, I'm pretty sure the percentage should
diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp
index 6682f659..43eef034 100644
--- a/src/core/hle/service/fs/archive.cpp
+++ b/src/core/hle/service/fs/archive.cpp
@@ -89,7 +89,7 @@ public:
class File : public Kernel::Session {
public:
File(std::unique_ptr<FileSys::FileBackend>&& backend, const FileSys::Path& path)
- : path(path), backend(std::move(backend)), priority(0) {
+ : path(path), priority(0), backend(std::move(backend)) {
}
std::string GetName() const override { return "Path: " + path.DebugStr(); }
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 60460292..52730a7b 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -150,7 +150,7 @@ ResultStatus LoadFile(const std::string& filename) {
// IdentifyFile could know identify file type...
case FileType::Unknown:
{
- LOG_CRITICAL(Loader, "File %s is of unknown type.");
+ LOG_CRITICAL(Loader, "File %s is of unknown type.", filename.c_str());
return ResultStatus::ErrorInvalidFormat;
}
}