From d8b5bb25d48cc3c97726b73bb3465ee6103c0d3f Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Thu, 26 May 2016 11:08:47 -0700 Subject: [PATCH] Bug 1275744 - Reference MOZ_LOG in dom comments. r=erahm NSPR_LOG_MODULES is deprecated. MozReview-Commit-ID: GgJTpEHyZqJ --HG-- extra : rebase_source : dea80975ee6281aff1476f99f1807f3093af82c9 --- dom/base/ThirdPartyUtil.cpp | 2 +- dom/camera/DOMCameraManager.cpp | 4 ++-- dom/media/systemservices/LoadManager.cpp | 2 +- dom/media/systemservices/LoadMonitor.cpp | 2 +- dom/media/systemservices/OpenSLESProvider.cpp | 2 +- dom/network/TCPSocketParent.cpp | 2 +- dom/network/UDPSocket.h | 2 +- dom/plugins/base/nsPluginLogging.h | 12 ++++++------ dom/presentation/PresentationLog.h | 2 +- dom/xul/templates/nsXULTemplateBuilder.cpp | 2 +- widget/gonk/nativewindow/GonkNativeWindowICS.cpp | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp index cba780187bda..a45ff039efa2 100644 --- a/dom/base/ThirdPartyUtil.cpp +++ b/dom/base/ThirdPartyUtil.cpp @@ -21,7 +21,7 @@ NS_IMPL_ISUPPORTS(ThirdPartyUtil, mozIThirdPartyUtil) // -// NSPR_LOG_MODULES=thirdPartyUtil:5 +// MOZ_LOG=thirdPartyUtil:5 // static mozilla::LazyLogModule gThirdPartyLog("thirdPartyUtil"); #undef LOG diff --git a/dom/camera/DOMCameraManager.cpp b/dom/camera/DOMCameraManager.cpp index 68054dc5db7d..8cc47859fb2d 100644 --- a/dom/camera/DOMCameraManager.cpp +++ b/dom/camera/DOMCameraManager.cpp @@ -39,8 +39,8 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMCameraManager) /** * Global camera logging object * - * Set the NSPR_LOG_MODULES environment variable to enable logging - * in a debug build, e.g. NSPR_LOG_MODULES=Camera:5 + * Set the MOZ_LOG environment variable to enable logging + * in a debug build, e.g. MOZ_LOG=Camera:5 */ LogModule* GetCameraLog() diff --git a/dom/media/systemservices/LoadManager.cpp b/dom/media/systemservices/LoadManager.cpp index b090c805552d..c2a619b0b013 100644 --- a/dom/media/systemservices/LoadManager.cpp +++ b/dom/media/systemservices/LoadManager.cpp @@ -18,7 +18,7 @@ #include "mozilla/Telemetry.h" #include "mozilla/ArrayUtils.h" -// NSPR_LOG_MODULES=LoadManager:5 +// MOZ_LOG=LoadManager:5 mozilla::LazyLogModule gLoadManagerLog("LoadManager"); #undef LOG #undef LOG_ENABLED diff --git a/dom/media/systemservices/LoadMonitor.cpp b/dom/media/systemservices/LoadMonitor.cpp index 99457b9fd00c..c5823000d40b 100644 --- a/dom/media/systemservices/LoadMonitor.cpp +++ b/dom/media/systemservices/LoadMonitor.cpp @@ -55,7 +55,7 @@ #pragma comment(lib, "pdh.lib") #endif -// NSPR_LOG_MODULES=LoadManager:5 +// MOZ_LOG=LoadManager:5 #undef LOG #undef LOG_ENABLED #define LOG(args) MOZ_LOG(gLoadManagerLog, mozilla::LogLevel::Debug, args) diff --git a/dom/media/systemservices/OpenSLESProvider.cpp b/dom/media/systemservices/OpenSLESProvider.cpp index 8b417884e8f2..c7348afa0b61 100644 --- a/dom/media/systemservices/OpenSLESProvider.cpp +++ b/dom/media/systemservices/OpenSLESProvider.cpp @@ -11,7 +11,7 @@ #include #include -// NSPR_LOG_MODULES=OpenSLESProvider:5 +// MOZ_LOG=OpenSLESProvider:5 #undef LOG #undef LOG_ENABLED mozilla::LazyLogModule gOpenSLESProviderLog("OpenSLESProvider"); diff --git a/dom/network/TCPSocketParent.cpp b/dom/network/TCPSocketParent.cpp index f4305447f78e..4420f7ce365a 100644 --- a/dom/network/TCPSocketParent.cpp +++ b/dom/network/TCPSocketParent.cpp @@ -35,7 +35,7 @@ namespace mozilla { namespace net { // -// set NSPR_LOG_MODULES=TCPSocket:5 +// set MOZ_LOG=TCPSocket:5 // extern LazyLogModule gTCPSocketLog; #define TCPSOCKET_LOG(args) MOZ_LOG(gTCPSocketLog, LogLevel::Debug, args) diff --git a/dom/network/UDPSocket.h b/dom/network/UDPSocket.h index bf5710fd71b9..12427d1dd050 100644 --- a/dom/network/UDPSocket.h +++ b/dom/network/UDPSocket.h @@ -19,7 +19,7 @@ struct JSContext; // -// set NSPR_LOG_MODULES=UDPSocket:5 +// set MOZ_LOG=UDPSocket:5 // namespace mozilla { diff --git a/dom/plugins/base/nsPluginLogging.h b/dom/plugins/base/nsPluginLogging.h index e6c9ed0280d0..b51d3531e788 100644 --- a/dom/plugins/base/nsPluginLogging.h +++ b/dom/plugins/base/nsPluginLogging.h @@ -17,7 +17,7 @@ //////////////////////////////////////////////////////////////////////////////// // Basic Plugin Logging Usage Instructions // -// 1. Set this environment variable: NSPR_LOG_MODULES=: +// 1. Set this environment variable: MOZ_LOG=: // Choose the and from this list (no quotes): @@ -33,14 +33,14 @@ #define PLUGIN_LOG_NOISY mozilla::LogLevel::Verbose // 2. You can combine logs and levels by separating them with a comma: -// My favorite Win32 Example: SET NSPR_LOG_MODULES=Plugin:5,PluginNPP:5,PluginNPN:5 +// My favorite Win32 Example: SET MOZ_LOG=Plugin:5,PluginNPP:5,PluginNPN:5 // 3. Instead of output going to the console, you can log to a file. Additionally, set the -// NSPR_LOG_FILE environment variable to point to the full path of a file. -// My favorite Win32 Example: SET NSPR_LOG_FILE=c:\temp\pluginLog.txt +// MOZ_LOG_FILE environment variable to point to the full path of a file. +// My favorite Win32 Example: SET MOZ_LOG_FILE=c:\temp\pluginLog.txt -// 4. For complete information see the NSPR Reference: -// http://www.mozilla.org/projects/nspr/reference/html/prlog.html +// 4. For complete information see the Gecko Developer guide: +// https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Gecko_Logging #ifdef PLUGIN_LOGGING diff --git a/dom/presentation/PresentationLog.h b/dom/presentation/PresentationLog.h index 92508ca80d4d..96af0c1249e1 100644 --- a/dom/presentation/PresentationLog.h +++ b/dom/presentation/PresentationLog.h @@ -8,7 +8,7 @@ #define mozilla_dom_PresentationLog_h /* - * NSPR_LOG_MODULES=Presentation:5 + * MOZ_LOG=Presentation:5 * For detail, see PresentationService.cpp */ namespace mozilla { diff --git a/dom/xul/templates/nsXULTemplateBuilder.cpp b/dom/xul/templates/nsXULTemplateBuilder.cpp index 6d63ebc2cce5..46aed5cc593a 100644 --- a/dom/xul/templates/nsXULTemplateBuilder.cpp +++ b/dom/xul/templates/nsXULTemplateBuilder.cpp @@ -13,7 +13,7 @@ To turn on logging for this module, set: - NSPR_LOG_MODULES nsXULTemplateBuilder:5 + MOZ_LOG=nsXULTemplateBuilder:5 */ diff --git a/widget/gonk/nativewindow/GonkNativeWindowICS.cpp b/widget/gonk/nativewindow/GonkNativeWindowICS.cpp index ab91185c71aa..112de5b16dd5 100644 --- a/widget/gonk/nativewindow/GonkNativeWindowICS.cpp +++ b/widget/gonk/nativewindow/GonkNativeWindowICS.cpp @@ -26,7 +26,7 @@ /** * DOM_CAMERA_LOGI() is enabled in debug builds, and turned on by setting - * NSPR_LOG_MODULES=Camera:N environment variable, where N >= 3. + * MOZ_LOG=Camera:N environment variable, where N >= 3. * * CNW_LOGE() is always enabled. */