From dfcb5005d283d3ca2862c4b7dfa956c8d68b0ef5 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 22 Mar 2022 13:27:05 -0700 Subject: [PATCH] fs/sprof/build: fix minor issues --- atmosphere.mk | 24 +++++++++---------- .../libstratosphere/source/fs/fs_code.cpp | 4 ++-- .../libstratosphere/source/fs/fs_sd_card.cpp | 2 +- .../srv/sprofile_srv_service_getter.hpp | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/atmosphere.mk b/atmosphere.mk index 89b8c5778..d25faa81e 100644 --- a/atmosphere.mk +++ b/atmosphere.mk @@ -75,33 +75,33 @@ dist-no-debug: package3 $(CURRENT_DIRECTORY)/$(ATMOSPHERE_OUT_DIR) cp -r config_templates/kip_patches $(DIST_DIR)/atmosphere/kip_patches cp -r config_templates/hbl_html $(DIST_DIR)/atmosphere/hbl_html mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000008 - mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000000D + mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000000d mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000017 - mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000002B + mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000002b mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000032 mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000034 mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000036 mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000037 - mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000003C + mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000003c mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000042 mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000420 - mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000B240 - mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000D609 - mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000D623 + mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000b240 + mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000d609 + mkdir -p $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000d623 cp stratosphere/boot2/$(ATMOSPHERE_OUT_DIR)/boot2.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000008/exefs.nsp - cp stratosphere/dmnt/$(ATMOSPHERE_OUT_DIR)/dmnt.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000000D/exefs.nsp + cp stratosphere/dmnt/$(ATMOSPHERE_OUT_DIR)/dmnt.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000000d/exefs.nsp cp stratosphere/cs/$(ATMOSPHERE_OUT_DIR)/cs.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000017/exefs.nsp - cp stratosphere/erpt/$(ATMOSPHERE_OUT_DIR)/erpt.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000002B/exefs.nsp + cp stratosphere/erpt/$(ATMOSPHERE_OUT_DIR)/erpt.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000002b/exefs.nsp cp stratosphere/eclct.stub/$(ATMOSPHERE_OUT_DIR)/eclct.stub.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000032/exefs.nsp cp stratosphere/fatal/$(ATMOSPHERE_OUT_DIR)/fatal.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000034/exefs.nsp cp stratosphere/creport/$(ATMOSPHERE_OUT_DIR)/creport.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000036/exefs.nsp cp stratosphere/ro/$(ATMOSPHERE_OUT_DIR)/ro.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000037/exefs.nsp - cp stratosphere/jpegdec/$(ATMOSPHERE_OUT_DIR)/jpegdec.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000003C/exefs.nsp + cp stratosphere/jpegdec/$(ATMOSPHERE_OUT_DIR)/jpegdec.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000003c/exefs.nsp cp stratosphere/pgl/$(ATMOSPHERE_OUT_DIR)/pgl.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000042/exefs.nsp cp stratosphere/LogManager/$(ATMOSPHERE_OUT_DIR)/LogManager.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/0100000000000420/exefs.nsp - cp stratosphere/htc/$(ATMOSPHERE_OUT_DIR)/htc.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000B240/exefs.nsp - cp stratosphere/dmnt.gen2/$(ATMOSPHERE_OUT_DIR)/dmnt.gen2.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000D609/exefs.nsp - cp stratosphere/TioServer/$(ATMOSPHERE_OUT_DIR)/TioServer.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000D623/exefs.nsp + cp stratosphere/htc/$(ATMOSPHERE_OUT_DIR)/htc.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000b240/exefs.nsp + cp stratosphere/dmnt.gen2/$(ATMOSPHERE_OUT_DIR)/dmnt.gen2.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000d609/exefs.nsp + cp stratosphere/TioServer/$(ATMOSPHERE_OUT_DIR)/TioServer.nsp $(DIST_DIR)/stratosphere_romfs/atmosphere/contents/010000000000d623/exefs.nsp @build_romfs $(DIST_DIR)/stratosphere_romfs $(DIST_DIR)/atmosphere/stratosphere.romfs rm -r $(DIST_DIR)/stratosphere_romfs cp troposphere/reboot_to_payload/reboot_to_payload.nro $(DIST_DIR)/switch/reboot_to_payload.nro diff --git a/libraries/libstratosphere/source/fs/fs_code.cpp b/libraries/libstratosphere/source/fs/fs_code.cpp index c70023930..b39df8f15 100644 --- a/libraries/libstratosphere/source/fs/fs_code.cpp +++ b/libraries/libstratosphere/source/fs/fs_code.cpp @@ -134,7 +134,7 @@ namespace ams::fs { } /* Create a file storage for the program's package. */ - auto package_storage = std::make_shared(std::move(package_file)); + auto package_storage = fs::AllocateShared(std::move(package_file)); R_UNLESS(package_storage != nullptr, fs::ResultAllocationMemoryFailedInCodeA()); /* Create a partition filesystem. */ @@ -177,7 +177,7 @@ namespace ams::fs { R_TRY(fsp->OpenSdCardFileSystem(std::addressof(fs))); /* Allocate a new filesystem wrapper. */ - auto fsa = std::make_shared(std::move(fs)); + auto fsa = fs::AllocateShared(std::move(fs)); R_UNLESS(fsa != nullptr, fs::ResultAllocationMemoryFailedInCodeA()); *out = std::move(fsa); diff --git a/libraries/libstratosphere/source/fs/fs_sd_card.cpp b/libraries/libstratosphere/source/fs/fs_sd_card.cpp index 7432081cc..17051630a 100644 --- a/libraries/libstratosphere/source/fs/fs_sd_card.cpp +++ b/libraries/libstratosphere/source/fs/fs_sd_card.cpp @@ -79,7 +79,7 @@ namespace ams::fs { R_TRY(fsp->OpenSdCardFileSystem(std::addressof(fs))); /* Allocate a new filesystem wrapper. */ - auto fsa = std::make_shared(std::move(fs)); + auto fsa = fs::AllocateShared(std::move(fs)); R_UNLESS(fsa != nullptr, fs::ResultAllocationMemoryFailedInSdCardA()); /* Ensure that the error report directory exists. */ diff --git a/libraries/libstratosphere/source/sprofile/srv/sprofile_srv_service_getter.hpp b/libraries/libstratosphere/source/sprofile/srv/sprofile_srv_service_getter.hpp index accf6524e..d741abc7a 100644 --- a/libraries/libstratosphere/source/sprofile/srv/sprofile_srv_service_getter.hpp +++ b/libraries/libstratosphere/source/sprofile/srv/sprofile_srv_service_getter.hpp @@ -24,7 +24,7 @@ namespace ams::sprofile::srv { sf::SharedPointer<::ams::sprofile::srv::ISprofileServiceForBgAgent> m_service_for_bg_agent; sf::SharedPointer<::ams::sprofile::srv::ISprofileServiceForSystemProcess> m_service_for_system_process; public: - constexpr ServiceGetter(sf::SharedPointer<::ams::sprofile::srv::ISprofileServiceForBgAgent> &&bg, sf::SharedPointer<::ams::sprofile::srv::ISprofileServiceForSystemProcess> &&sp) : m_service_for_bg_agent(bg), m_service_for_system_process(sp) { /* ... */ } + constexpr ServiceGetter(sf::SharedPointer<::ams::sprofile::srv::ISprofileServiceForBgAgent> bg, sf::SharedPointer<::ams::sprofile::srv::ISprofileServiceForSystemProcess> sp) : m_service_for_bg_agent(bg), m_service_for_system_process(sp) { /* ... */ } public: Result GetServiceForSystemProcess(sf::Out> out); Result GetServiceForBgAgent(sf::Out> out);