Address more feedback

2025-04-22 04:24:48 +00:00 · 2020-02-25 23:52:55 +11:00 · 2020-02-25 23:52:55 +11:00 · b6c9bf42df
commit b6c9bf42df
parent 649e708d5c
41 changed files with 69 additions and 70 deletions
--- a/libraries/libstratosphere/include/stratosphere/lr/lr_types.hpp
+++ b/libraries/libstratosphere/include/stratosphere/lr/lr_types.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/impl/lr_location_resolver_manager_impl.cpp
+++ b/stratosphere/ncm/source/impl/lr_location_resolver_manager_impl.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/impl/lr_location_resolver_manager_impl.hpp
+++ b/stratosphere/ncm/source/impl/lr_location_resolver_manager_impl.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/impl/lr_redirection.cpp
+++ b/stratosphere/ncm/source/impl/lr_redirection.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@ -18,16 +18,16 @@

 namespace ams::lr::impl {

-    class LocationRedirection  : public util::IntrusiveListBaseNode<LocationRedirection> {
-        NON_COPYABLE(LocationRedirection);
-        NON_MOVEABLE(LocationRedirection);
+    class LocationRedirector::Redirection : public util::IntrusiveListBaseNode<Redirection> {
+        NON_COPYABLE(Redirection);
+        NON_MOVEABLE(Redirection);
        private:
            ncm::ProgramId program_id;
            ncm::ProgramId owner_id;
            Path path;
            u32 flags;
        public:
-            LocationRedirection(ncm::ProgramId program_id, ncm::ProgramId owner_id, const Path& path, u32 flags) :
+            Redirection(ncm::ProgramId program_id, ncm::ProgramId owner_id, const Path& path, u32 flags) :
                program_id(program_id), owner_id(owner_id), path(path), flags(flags) { /* ... */ }

            ncm::ProgramId GetProgramId() const {
@ -52,10 +52,6 @@ namespace ams::lr::impl {
    };

    bool LocationRedirector::FindRedirection(Path *out, ncm::ProgramId program_id) {
-        if (this->redirection_list.empty()) {
-            return false;
-        }
-
        for (const auto &redirection : this->redirection_list) {
            if (redirection.GetProgramId() == program_id) {
                redirection.GetPath(out);
@ -71,7 +67,7 @@ namespace ams::lr::impl {

    void LocationRedirector::SetRedirection(ncm::ProgramId program_id, ncm::ProgramId owner_id, const Path &path, u32 flags) {
        this->EraseRedirection(program_id);
-        this->redirection_list.push_back(*(new LocationRedirection(program_id, owner_id, path, flags)));
+        this->redirection_list.push_back(*(new Redirection(program_id, owner_id, path, flags)));
    }

    void LocationRedirector::SetRedirectionFlags(ncm::ProgramId program_id, u32 flags) {
@ -98,7 +94,7 @@ namespace ams::lr::impl {
            if ((it->GetFlags() & flags) == flags) {
                auto old = it;
                it = this->redirection_list.erase(it);
-                delete &(*old);
+                delete std::addressof(*old);
            } else {
                it++;
            }
@ -114,7 +110,7 @@ namespace ams::lr::impl {

            auto old = it;
            it = this->redirection_list.erase(it);
-            delete &(*old);
+            delete std::addressof(*old);
        }
    }

--- a/stratosphere/ncm/source/impl/lr_redirection.hpp
+++ b/stratosphere/ncm/source/impl/lr_redirection.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@ -24,16 +24,19 @@ namespace ams::lr::impl {
        RedirectionFlags_None        = (0 << 0),
        RedirectionFlags_Application = (1 << 0),
    };
- 
-    class LocationRedirection;

    class LocationRedirector {
        NON_COPYABLE(LocationRedirector);
        NON_MOVEABLE(LocationRedirector);
        private:
-            ams::util::IntrusiveListBaseTraits<LocationRedirection>::ListType redirection_list;
+            class Redirection;
+        private:
+            using RedirectionList = ams::util::IntrusiveListBaseTraits<Redirection>::ListType;
+        private:
+            RedirectionList redirection_list;
        public:
            LocationRedirector() { /* ... */ }
+            ~LocationRedirector() { this->ClearRedirections(); }

            bool FindRedirection(Path *out, ncm::ProgramId program_id);
            void SetRedirection(ncm::ProgramId program_id, const Path &path, u32 flags = RedirectionFlags_None);
--- a/stratosphere/ncm/source/impl/lr_registered_data.hpp
+++ b/stratosphere/ncm/source/impl/lr_registered_data.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@ -33,15 +33,15 @@ namespace ams::lr::impl {
            };
        private:
            Entry entries[NumEntries];
-            size_t soft_entry_limit;
+            size_t capacity;
        public:
-            RegisteredData(size_t soft_entry_limit = NumEntries) : soft_entry_limit(soft_entry_limit) {
+            RegisteredData(size_t capacity = NumEntries) : capacity(capacity) {
                this->Clear();
            }

            bool Register(const Key &key, const Value &value, const ncm::ProgramId owner_id) {
                /* Try to find an existing value. */
-                for (size_t i = 0; i < this->GetSoftEntryLimit(); i++) {
+                for (size_t i = 0; i < this->GetCapacity(); i++) {
                    Entry& entry = this->entries[i];
                    if (entry.is_valid && entry.key == key) {
                        entry.value = value;
@ -49,7 +49,7 @@ namespace ams::lr::impl {
                    }
                }

-                for (size_t i = 0; i < this->GetSoftEntryLimit(); i++) {
+                for (size_t i = 0; i < this->GetCapacity(); i++) {
                    Entry& entry = this->entries[i];
                    if (!entry.is_valid) {
                        entry.key = key;
@ -64,7 +64,7 @@ namespace ams::lr::impl {
            }

            void Unregister(const Key &key) {
-                for (size_t i = 0; i < this->GetSoftEntryLimit(); i++) {
+                for (size_t i = 0; i < this->GetCapacity(); i++) {
                    Entry& entry = this->entries[i];
                    if (entry.is_valid && entry.key == key) {
                        entry.is_valid = false;
@ -73,7 +73,7 @@ namespace ams::lr::impl {
            }

            void UnregisterOwnerProgram(ncm::ProgramId owner_id) {
-                for (size_t i = 0; i < this->GetSoftEntryLimit(); i++) {
+                for (size_t i = 0; i < this->GetCapacity(); i++) {
                    Entry& entry = this->entries[i];
                    if (entry.owner_id == owner_id) {
                        entry.is_valid = false;
@ -82,7 +82,7 @@ namespace ams::lr::impl {
            }

            bool Find(Value *out, const Key &key) {
-                for (size_t i = 0; i < this->GetSoftEntryLimit(); i++) {
+                for (size_t i = 0; i < this->GetCapacity(); i++) {
                    Entry& entry = this->entries[i];
                    if (entry.is_valid && entry.key == key) {
                        *out = entry.value;
@ -94,13 +94,13 @@ namespace ams::lr::impl {
            }

            void Clear() {
-                for (size_t i = 0; i < this->GetSoftEntryLimit(); i++) {
+                for (size_t i = 0; i < this->GetCapacity(); i++) {
                    this->entries[i].is_valid = false;
                }
            }

            void ClearExcluding(const ncm::ProgramId* ids, size_t num_ids) {
-                for (size_t i = 0; i < this->GetSoftEntryLimit(); i++) {
+                for (size_t i = 0; i < this->GetCapacity(); i++) {
                    Entry& entry = this->entries[i];
                    bool found = false;

@ -119,8 +119,8 @@ namespace ams::lr::impl {
                }
            }

-            size_t GetSoftEntryLimit() const {
-                return this->soft_entry_limit;
+            size_t GetCapacity() const {
+                return this->capacity;
            }
    };

--- a/stratosphere/ncm/source/impl/ncm_bounded_map.hpp
+++ b/stratosphere/ncm/source/impl/ncm_bounded_map.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@ -77,7 +77,7 @@ namespace ams::ncm::impl {
                }

                /* We ran out of space in the map. */
-                std::abort();
+                AMS_ABORT();
            }
    };

--- a/stratosphere/ncm/source/impl/ncm_content_manager.cpp
+++ b/stratosphere/ncm/source/impl/ncm_content_manager.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/impl/ncm_content_manager.hpp
+++ b/stratosphere/ncm/source/impl/ncm_content_manager.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/impl/ncm_placeholder_accessor.cpp
+++ b/stratosphere/ncm/source/impl/ncm_placeholder_accessor.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@ -108,7 +108,7 @@ namespace ams::ncm::impl {
            return 2;
        }

-        std::abort();
+        AMS_ABORT();
    }

    void PlaceHolderAccessor::GetPath(char* placeholder_path_out, PlaceHolderId placeholder_id) {
--- a/stratosphere/ncm/source/impl/ncm_placeholder_accessor.hpp
+++ b/stratosphere/ncm/source/impl/ncm_placeholder_accessor.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/impl/ncm_rights_cache.hpp
+++ b/stratosphere/ncm/source/impl/ncm_rights_cache.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/lr_addoncontentlocationresolver.cpp
+++ b/stratosphere/ncm/source/lr_addoncontentlocationresolver.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/lr_addoncontentlocationresolver.hpp
+++ b/stratosphere/ncm/source/lr_addoncontentlocationresolver.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/lr_contentlocationresolver.cpp
+++ b/stratosphere/ncm/source/lr_contentlocationresolver.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/lr_contentlocationresolver.hpp
+++ b/stratosphere/ncm/source/lr_contentlocationresolver.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/lr_i_location_resolver_manager.hpp
+++ b/stratosphere/ncm/source/lr_i_location_resolver_manager.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/lr_ilocationresolver.hpp
+++ b/stratosphere/ncm/source/lr_ilocationresolver.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/lr_redirectonlylocationresolver.cpp
+++ b/stratosphere/ncm/source/lr_redirectonlylocationresolver.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/lr_redirectonlylocationresolver.hpp
+++ b/stratosphere/ncm/source/lr_redirectonlylocationresolver.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/lr_registeredlocationresolver.cpp
+++ b/stratosphere/ncm/source/lr_registeredlocationresolver.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/lr_registeredlocationresolver.hpp
+++ b/stratosphere/ncm/source/lr_registeredlocationresolver.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_content_manager_service.cpp
+++ b/stratosphere/ncm/source/ncm_content_manager_service.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_content_manager_service.hpp
+++ b/stratosphere/ncm/source/ncm_content_manager_service.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_contentmetadatabase.cpp
+++ b/stratosphere/ncm/source/ncm_contentmetadatabase.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_contentmetadatabase.hpp
+++ b/stratosphere/ncm/source/ncm_contentmetadatabase.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_contentstorage.cpp
+++ b/stratosphere/ncm/source/ncm_contentstorage.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@ -62,7 +62,7 @@ namespace ams::ncm {
            return 3;
        }

-        std::abort();
+        AMS_ABORT();
    }

    Result ContentStorageInterface::OpenCachedContentFile(ContentId content_id) {
--- a/stratosphere/ncm/source/ncm_contentstorage.hpp
+++ b/stratosphere/ncm/source/ncm_contentstorage.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_fs.cpp
+++ b/stratosphere/ncm/source/ncm_fs.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@ -257,7 +257,7 @@ namespace ams::ncm::fs {
                break;

            default:
-                std::abort();
+                AMS_ABORT();
        };
        return ResultSuccess();
    }
--- a/stratosphere/ncm/source/ncm_fs.hpp
+++ b/stratosphere/ncm/source/ncm_fs.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_icontentmetadatabase.hpp
+++ b/stratosphere/ncm/source/ncm_icontentmetadatabase.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_icontentstorage.hpp
+++ b/stratosphere/ncm/source/ncm_icontentstorage.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_main.cpp
+++ b/stratosphere/ncm/source/ncm_main.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_make_path.cpp
+++ b/stratosphere/ncm/source/ncm_make_path.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_make_path.hpp
+++ b/stratosphere/ncm/source/ncm_make_path.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_path_utils.cpp
+++ b/stratosphere/ncm/source/ncm_path_utils.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_path_utils.hpp
+++ b/stratosphere/ncm/source/ncm_path_utils.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_readonlycontentstorage.cpp
+++ b/stratosphere/ncm/source/ncm_readonlycontentstorage.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_readonlycontentstorage.hpp
+++ b/stratosphere/ncm/source/ncm_readonlycontentstorage.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_utils.cpp
+++ b/stratosphere/ncm/source/ncm_utils.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/stratosphere/ncm/source/ncm_utils.hpp
+++ b/stratosphere/ncm/source/ncm_utils.hpp
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 Adubbz, Atmosphere-NX
+ * Copyright (c) 2019-2020 Adubbz, Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,