From cae107557d2c558d28d9f8f14a1297fa63f629eb Mon Sep 17 00:00:00 2001 From: TuxSH Date: Tue, 15 May 2018 00:54:12 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20the=20remaining=20warnings=20in=20stratos?= =?UTF-8?q?ph=C3=A8re?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stratosphere/loader/source/ldr_content_management.cpp | 4 ++-- stratosphere/loader/source/ldr_launch_queue.cpp | 2 +- stratosphere/pm/source/pm_resource_limits.cpp | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/stratosphere/loader/source/ldr_content_management.cpp b/stratosphere/loader/source/ldr_content_management.cpp index f2acf3f48..29487b327 100644 --- a/stratosphere/loader/source/ldr_content_management.cpp +++ b/stratosphere/loader/source/ldr_content_management.cpp @@ -68,7 +68,7 @@ Result ContentManagement::ResolveContentPath(char *out_path, u64 tid, FsStorageI } if (R_SUCCEEDED(rc = lrRegLrResolveProgramPath(®, tid, path))) { - strncpy(out_path, path, sizeof(path)); + strncpy(out_path, path, FS_MAX_PATH); } else if (rc != 0x408) { return rc; } @@ -84,7 +84,7 @@ Result ContentManagement::ResolveContentPath(char *out_path, u64 tid, FsStorageI } if (R_SUCCEEDED(rc = lrLrResolveProgramPath(&lr, tid, path))) { - strncpy(out_path, path, sizeof(path)); + strncpy(out_path, path, FS_MAX_PATH); } serviceClose(&lr.s); diff --git a/stratosphere/loader/source/ldr_launch_queue.cpp b/stratosphere/loader/source/ldr_launch_queue.cpp index cbca94b02..456027b03 100644 --- a/stratosphere/loader/source/ldr_launch_queue.cpp +++ b/stratosphere/loader/source/ldr_launch_queue.cpp @@ -22,7 +22,7 @@ Result LaunchQueue::add(u64 tid, const char *args, u64 arg_size) { } Result LaunchQueue::add_copy(u64 tid_base, u64 tid) { - unsigned int idx = get_index(tid_base); + int idx = get_index(tid_base); if (idx == LAUNCH_QUEUE_FULL) { return 0x0; } diff --git a/stratosphere/pm/source/pm_resource_limits.cpp b/stratosphere/pm/source/pm_resource_limits.cpp index 1174c68e4..f45f135e9 100644 --- a/stratosphere/pm/source/pm_resource_limits.cpp +++ b/stratosphere/pm/source/pm_resource_limits.cpp @@ -123,7 +123,6 @@ void ResourceLimitUtils::InitializeLimits() { } void ResourceLimitUtils::EnsureApplicationResourcesAvailable() { - Result rc; Handle application_reslimit_h = g_resource_limit_handles[1]; for (unsigned int i = 0; i < 5; i++) { u64 result; @@ -199,4 +198,4 @@ Result ResourceLimitUtils::BoostSystemMemoryResourceLimit(u64 boost_size) { g_system_boost_size = boost_size; } return rc; -} \ No newline at end of file +}