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__); }