From 3d546266d0c8ffc6739b07273185647802bdc001 Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Thu, 26 May 2016 11:14:47 -0700 Subject: [PATCH] Bug 1275744 - Reference MOZ_LOG in toolkit comments. r=erahm NSPR_LOG_MODULES is deprecated. MozReview-Commit-ID: 2iZFe60Uxvi --- toolkit/components/downloads/ApplicationReputation.cpp | 2 +- toolkit/components/downloads/ApplicationReputation.h | 2 +- toolkit/components/url-classifier/Classifier.cpp | 2 +- toolkit/components/url-classifier/HashStore.cpp | 2 +- toolkit/components/url-classifier/LookupCache.cpp | 2 +- toolkit/components/url-classifier/ProtocolParser.cpp | 2 +- toolkit/components/url-classifier/nsUrlClassifierDBService.cpp | 2 +- toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp | 2 +- .../components/url-classifier/nsUrlClassifierStreamUpdater.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/toolkit/components/downloads/ApplicationReputation.cpp b/toolkit/components/downloads/ApplicationReputation.cpp index 24090fd67dbd..fc872f2a7bec 100644 --- a/toolkit/components/downloads/ApplicationReputation.cpp +++ b/toolkit/components/downloads/ApplicationReputation.cpp @@ -77,7 +77,7 @@ using safe_browsing::ClientDownloadRequest_SignatureInfo; #define PREF_BLOCK_POTENTIALLY_UNWANTED "browser.safebrowsing.downloads.remote.block_potentially_unwanted" #define PREF_BLOCK_UNCOMMON "browser.safebrowsing.downloads.remote.block_uncommon" -// NSPR_LOG_MODULES=ApplicationReputation:5 +// MOZ_LOG=ApplicationReputation:5 mozilla::LazyLogModule ApplicationReputationService::prlog("ApplicationReputation"); #define LOG(args) MOZ_LOG(ApplicationReputationService::prlog, mozilla::LogLevel::Debug, args) #define LOG_ENABLED() MOZ_LOG_TEST(ApplicationReputationService::prlog, mozilla::LogLevel::Debug) diff --git a/toolkit/components/downloads/ApplicationReputation.h b/toolkit/components/downloads/ApplicationReputation.h index f5201dd7a049..0ed68d6163eb 100644 --- a/toolkit/components/downloads/ApplicationReputation.h +++ b/toolkit/components/downloads/ApplicationReputation.h @@ -37,7 +37,7 @@ private: */ static ApplicationReputationService* gApplicationReputationService; /** - * NSPR_LOG_MODULES=ApplicationReputation:5 + * MOZ_LOG=ApplicationReputation:5 */ static mozilla::LazyLogModule prlog; /** diff --git a/toolkit/components/url-classifier/Classifier.cpp b/toolkit/components/url-classifier/Classifier.cpp index 4e5b0d4bbad9..5061419b1645 100644 --- a/toolkit/components/url-classifier/Classifier.cpp +++ b/toolkit/components/url-classifier/Classifier.cpp @@ -16,7 +16,7 @@ #include "mozilla/Telemetry.h" #include "mozilla/Logging.h" -// NSPR_LOG_MODULES=UrlClassifierDbService:5 +// MOZ_LOG=UrlClassifierDbService:5 extern mozilla::LazyLogModule gUrlClassifierDbServiceLog; #define LOG(args) MOZ_LOG(gUrlClassifierDbServiceLog, mozilla::LogLevel::Debug, args) #define LOG_ENABLED() MOZ_LOG_TEST(gUrlClassifierDbServiceLog, mozilla::LogLevel::Debug) diff --git a/toolkit/components/url-classifier/HashStore.cpp b/toolkit/components/url-classifier/HashStore.cpp index 92ad115ca603..d57038dfcf43 100644 --- a/toolkit/components/url-classifier/HashStore.cpp +++ b/toolkit/components/url-classifier/HashStore.cpp @@ -92,7 +92,7 @@ // Name of the SafeBrowsing store #define STORE_SUFFIX ".sbstore" -// NSPR_LOG_MODULES=UrlClassifierDbService:5 +// MOZ_LOG=UrlClassifierDbService:5 extern mozilla::LazyLogModule gUrlClassifierDbServiceLog; #define LOG(args) MOZ_LOG(gUrlClassifierDbServiceLog, mozilla::LogLevel::Debug, args) #define LOG_ENABLED() MOZ_LOG_TEST(gUrlClassifierDbServiceLog, mozilla::LogLevel::Debug) diff --git a/toolkit/components/url-classifier/LookupCache.cpp b/toolkit/components/url-classifier/LookupCache.cpp index e546e2d12f62..1d29fccd30c0 100644 --- a/toolkit/components/url-classifier/LookupCache.cpp +++ b/toolkit/components/url-classifier/LookupCache.cpp @@ -34,7 +34,7 @@ // Name of the persistent PrefixSet storage #define PREFIXSET_SUFFIX ".pset" -// NSPR_LOG_MODULES=UrlClassifierDbService:5 +// MOZ_LOG=UrlClassifierDbService:5 extern mozilla::LazyLogModule gUrlClassifierDbServiceLog; #define LOG(args) MOZ_LOG(gUrlClassifierDbServiceLog, mozilla::LogLevel::Debug, args) #define LOG_ENABLED() MOZ_LOG_TEST(gUrlClassifierDbServiceLog, mozilla::LogLevel::Debug) diff --git a/toolkit/components/url-classifier/ProtocolParser.cpp b/toolkit/components/url-classifier/ProtocolParser.cpp index dbf55b56428c..76f69f45acb4 100644 --- a/toolkit/components/url-classifier/ProtocolParser.cpp +++ b/toolkit/components/url-classifier/ProtocolParser.cpp @@ -12,7 +12,7 @@ #include "nsUrlClassifierUtils.h" -// NSPR_LOG_MODULES=UrlClassifierProtocolParser:5 +// MOZ_LOG=UrlClassifierProtocolParser:5 mozilla::LazyLogModule gUrlClassifierProtocolParserLog("UrlClassifierProtocolParser"); #define PARSER_LOG(args) MOZ_LOG(gUrlClassifierProtocolParserLog, mozilla::LogLevel::Debug, args) diff --git a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp index 9e544bec33d1..342b32bfb1b9 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp @@ -54,7 +54,7 @@ using namespace mozilla; using namespace mozilla::safebrowsing; -// NSPR_LOG_MODULES=UrlClassifierDbService:5 +// MOZ_LOG=UrlClassifierDbService:5 LazyLogModule gUrlClassifierDbServiceLog("UrlClassifierDbService"); #define LOG(args) MOZ_LOG(gUrlClassifierDbServiceLog, mozilla::LogLevel::Debug, args) #define LOG_ENABLED() MOZ_LOG_TEST(gUrlClassifierDbServiceLog, mozilla::LogLevel::Debug) diff --git a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp index 595111639b1e..819fb6d4014a 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp @@ -28,7 +28,7 @@ using namespace mozilla; -// NSPR_LOG_MODULES=UrlClassifierPrefixSet:5 +// MOZ_LOG=UrlClassifierPrefixSet:5 static LazyLogModule gUrlClassifierPrefixSetLog("UrlClassifierPrefixSet"); #define LOG(args) MOZ_LOG(gUrlClassifierPrefixSetLog, mozilla::LogLevel::Debug, args) #define LOG_ENABLED() MOZ_LOG_TEST(gUrlClassifierPrefixSetLog, mozilla::LogLevel::Debug) diff --git a/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp b/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp index 86d120f1706f..9af4bfef7173 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp @@ -31,7 +31,7 @@ const uint32_t MAX_FILE_SIZE = (32 * 1024 * 1024); #undef LOG -// NSPR_LOG_MODULES=UrlClassifierStreamUpdater:5 +// MOZ_LOG=UrlClassifierStreamUpdater:5 static mozilla::LazyLogModule gUrlClassifierStreamUpdaterLog("UrlClassifierStreamUpdater"); #define LOG(args) TrimAndLog args