From 4bf429318c7c5900e54fca3da7f8bd0cdf4daa11 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Thu, 1 Dec 2011 05:49:10 +0000
Subject: [PATCH] =?UTF-8?q?trunk=20r529=20=E3=82=92=E3=83=9E=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8?=
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@530 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../1stNUP_for_2ndNUP/sources/ConsoleRestore/NtpClient.cpp  | 6 +++---
 branches/1stNUP_for_2ndNUP/sources/common/SdLogger.cpp      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/NtpClient.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/NtpClient.cpp
index f2a5114..b92040c 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/NtpClient.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/NtpClient.cpp
@@ -234,15 +234,15 @@ bool GetNtpTime(u32* ntpTime)
             switch (pollFd.revents)
             {
                 case nn::socket::POLLERR: // ソケットにエラーが発生しました。
-                    COMMON_LOGGER("Error: POLLERR  %s %d\n", __FILE__, __LINE__);
+                    COMMON_LOGGER("Error: POLLERR  %s %d\n", __func__, __LINE__);
                     retval = false;
                 break;
                 case nn::socket::POLLHUP: // ストリーム・ソケットが未接続です。
-                    COMMON_LOGGER("Error: POLLHUP %s %d\n", __FILE__, __LINE__);
+                    COMMON_LOGGER("Error: POLLHUP %s %d\n", __func__, __LINE__);
                     retval = false;
                 break;
                 case nn::socket::POLLNVAL: // 不正なソケット記述子です。
-                    COMMON_LOGGER("Error: POLLNVAL %s %d\n", __FILE__, __LINE__);
+                    COMMON_LOGGER("Error: POLLNVAL %s %d\n", __func__, __LINE__);
                     retval = false;
                 break;
                 default:
diff --git a/branches/1stNUP_for_2ndNUP/sources/common/SdLogger.cpp b/branches/1stNUP_for_2ndNUP/sources/common/SdLogger.cpp
index 5ce9d4b..087e7cb 100644
--- a/branches/1stNUP_for_2ndNUP/sources/common/SdLogger.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/common/SdLogger.cpp
@@ -44,7 +44,7 @@ void PrintResultIfFailed(nn::Result result, u32 line = 0)
     {
         if(line != 0)
         {
-            NN_LOG("%s, %d\n", __FILE__, line);
+            NN_LOG("%s, %d\n", __func__, line);
         }
         NN_DBG_PRINT_RESULT(result);
     }
@@ -216,7 +216,7 @@ nn::Result SdLogger::PrintCore(const char* str, size_t size)
     }
     else
     {
-        NN_LOG("SD TryInitialize failed, %s, %d\n", __FILE__, __LINE__);
+        NN_LOG("SD TryInitialize failed, %s, %d\n", __func__, __LINE__);
         PrintResultIfFailed(result, __LINE__);
     }