From 20d186148a86dc882deb3ac99b678eb5387149aa Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Tue, 8 Feb 2011 00:55:37 +0000
Subject: [PATCH] =?UTF-8?q?ReadonlySharedInfo=E3=82=92=E4=BD=BF=E3=82=8F?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=20=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A=E5=AF=BE=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@30 385bec56-5757-e545-9c3a-d8741f4650f1
---
 trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp   | 4 ----
 trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp | 4 ----
 trunk/ConsoleDataMigration/common/DrawSystemState.cpp        | 1 -
 trunk/ConsoleDataMigration/common/DrawSystemState.h          | 1 -
 trunk/ConsoleDataMigration/common/PlayHistoryManager.cpp     | 1 +
 5 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp
index a2fdae4..303d2cb 100644
--- a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp
@@ -256,9 +256,6 @@ extern "C" void nnMain(void)
     common::Logger::GetLoggerInstance()->PrintResultIfFailed(result , __LINE__);
     u64 friendCode = nn::friends::CTR::FriendKeyToFriendCode(friendKey);
 
-    // ReadOnlySharedInfoの取得
-    const nn::os::ReadOnlySharedInfo& rosi = nn::os::GetReadOnlySharedInfo();
-
     // バージョンの取得
     common::VerDef mVerData;
     common::GetSystemVersion(&mVerData, region);
@@ -365,7 +362,6 @@ extern "C" void nnMain(void)
                 macAddress,
                 operationMessage,
                 region,
-                rosi,
                 s_SerialNo
                 );
 
diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp
index d0e6a02..d585fc4 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp
@@ -267,9 +267,6 @@ extern "C" void nnMain(void)
     common::Logger::GetLoggerInstance()->PrintResultIfFailed(result , __LINE__);
     u64 friendCode = nn::friends::CTR::FriendKeyToFriendCode(friendKey);
 
-    // ReadOnlySharedInfoの取得
-    const nn::os::ReadOnlySharedInfo& rosi = nn::os::GetReadOnlySharedInfo();
-
     // バージョンの取得
     common::VerDef mVerData;
     common::GetSystemVersion(&mVerData, region);
@@ -376,7 +373,6 @@ extern "C" void nnMain(void)
                 macAddress,
                 operationMessage,
                 region,
-                rosi,
                 s_SerialNo
                 );
 
diff --git a/trunk/ConsoleDataMigration/common/DrawSystemState.cpp b/trunk/ConsoleDataMigration/common/DrawSystemState.cpp
index 2f3162a..8ca7170 100644
--- a/trunk/ConsoleDataMigration/common/DrawSystemState.cpp
+++ b/trunk/ConsoleDataMigration/common/DrawSystemState.cpp
@@ -57,7 +57,6 @@ void DrawSystemState
         char8* macAddress,
         ::std::vector<std::string>& operationMessage,
         nn::cfg::CTR::CfgRegionCode region,
-        const nn::os::ReadOnlySharedInfo& rosi,
         u8* s_SerialNo
 )
 {
diff --git a/trunk/ConsoleDataMigration/common/DrawSystemState.h b/trunk/ConsoleDataMigration/common/DrawSystemState.h
index 0eb29cb..7b7a996 100644
--- a/trunk/ConsoleDataMigration/common/DrawSystemState.h
+++ b/trunk/ConsoleDataMigration/common/DrawSystemState.h
@@ -62,7 +62,6 @@ void DrawSystemState
         char8* macAddress,
         ::std::vector<std::string>& operationMessage,
         nn::cfg::CTR::CfgRegionCode region,
-        const nn::os::ReadOnlySharedInfo& rosi,
         u8* s_SerialNo
 );
 
diff --git a/trunk/ConsoleDataMigration/common/PlayHistoryManager.cpp b/trunk/ConsoleDataMigration/common/PlayHistoryManager.cpp
index 1818264..8288ce2 100644
--- a/trunk/ConsoleDataMigration/common/PlayHistoryManager.cpp
+++ b/trunk/ConsoleDataMigration/common/PlayHistoryManager.cpp
@@ -212,6 +212,7 @@ void PlayHistoryManager::Dump()
             }
         }
     }
+    NN_UNUSED_VAR(pEvent);
 
     HeapManager::GetHeap()->Free(playEvent);
     return;