Bug 1353919 - polish log module names into consistent naming style. r=jorgk

ldap/xpcom/src/nsLDAPConnection.cpp

@@ -26,7 +26,6 @@
 #include "nsMemory.h"
 #include "nsLDAPUtils.h"
 #include "nsProxyRelease.h"
-#include "mozilla/Logging.h"
 #include "mozilla/Attributes.h"
 
 using namespace mozilla;

ldap/xpcom/src/nsLDAPInternal.h

@@ -9,6 +9,6 @@
 
 #include "mozilla/Logging.h"
 
-static mozilla::LazyLogModule gLDAPLogModule("ldap");
+extern mozilla::LazyLogModule gLDAPLogModule; // defined in nsLDAPService.cpp
 
 #endif // nsLDAPInternal_h_

ldap/xpcom/src/nsLDAPMessage.cpp

@@ -15,7 +15,6 @@
 #include "nsILDAPErrors.h"
 #include "nsIClassInfoImpl.h"
 #include "nsLDAPUtils.h"
-#include "mozilla/Logging.h"
 
 NS_IMPL_CLASSINFO(nsLDAPMessage, NULL, nsIClassInfo::THREADSAFE,
                   NS_LDAPMESSAGE_CID)

ldap/xpcom/src/nsLDAPOperation.cpp

@@ -18,7 +18,6 @@
 #include "nsIAuthModule.h"
 #include "nsArrayUtils.h"
 #include "nsMemory.h"
-#include "mozilla/Logging.h"
 
 // Helper function
 static nsresult TranslateLDAPErrorToNSError(const int ldapError)

ldap/xpcom/src/nsLDAPProtocolModule.cpp

@@ -22,7 +22,6 @@
 #include "nsLDAPSyncQuery.h"
 #endif
 #include "ldappr.h"
-#include "mozilla/Logging.h"
 
 // use the default constructor
 //

ldap/xpcom/src/nsLDAPService.cpp

@@ -15,10 +15,11 @@
 #include "nsILDAPErrors.h"
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
-#include "mozilla/Logging.h"
 
 using namespace mozilla;
 
+LazyLogModule gLDAPLogModule("LDAP");
+
 // Constants for CIDs used here.
 //
 static NS_DEFINE_CID(kLDAPConnectionCID, NS_LDAPCONNECTION_CID);

mailnews/addrbook/src/nsAbOutlookDirFactory.cpp

@@ -14,7 +14,7 @@
 #include "nsAbBaseCID.h"
 #include "mozilla/Logging.h"
 
-static mozilla::LazyLogModule gAbOutlookDirFactoryLog("nsAbOutlookDirFactoryLog");
+static mozilla::LazyLogModule gAbOutlookDirFactoryLog("AbOutlookDirFactory");
 
 #define PRINTF(args) MOZ_LOG(gAbOutlookDirFactoryLog, mozilla::LogLevel::Debug, args)
 

mailnews/addrbook/src/nsAbOutlookDirectory.cpp

@@ -25,7 +25,7 @@
 #include "nsArrayEnumerator.h"
 #include "nsMsgUtils.h"
 
-static mozilla::LazyLogModule gAbOutlookDirectoryLog("nsAbOutlookDirectoryLog");
+static mozilla::LazyLogModule gAbOutlookDirectoryLog("AbOutlookDirectory");
 
 #define PRINTF(args) MOZ_LOG(gAbOutlookDirectoryLog, mozilla::LogLevel::Debug, args)
 

mailnews/addrbook/src/nsAbWinHelper.cpp

@@ -17,7 +17,7 @@
 
 #include "mozilla/Logging.h"
 
-static mozilla::LazyLogModule gAbWinHelperLog("nsAbWinHelperLog");
+static mozilla::LazyLogModule gAbWinHelperLog("AbWinHelper");
 
 #define PRINTF(args) MOZ_LOG(gAbWinHelperLog, mozilla::LogLevel::Debug, args)
 

mailnews/addrbook/src/nsMapiAddressBook.cpp

@@ -6,7 +6,7 @@
 
 #include "mozilla/Logging.h"
 
-static mozilla::LazyLogModule gMapiAddressBookLog("nsMapiAddressBookLog");
+static mozilla::LazyLogModule gMapiAddressBookLog("MAPIAddressBook");
 
 #define PRINTF(args) MOZ_LOG(gMapiAddressBookLog, mozilla::LogLevel::Debug, args)
 

mailnews/addrbook/src/nsWabAddressBook.cpp

@@ -7,12 +7,12 @@
 #include "nsWabAddressBook.h"
 #include "mozilla/Logging.h"
 
-static mozilla::LazyLogModule gWabAddressBookLog("nsWabAddressBookLog");
+using namespace mozilla;
+
+static LazyLogModule gWabAddressBookLog("WABAddressBook");
 
 #define PRINTF(args) MOZ_LOG(gWabAddressBookLog, mozilla::LogLevel::Debug, args)
 
-using namespace mozilla;
-
 HMODULE nsWabAddressBook::mLibrary = NULL ;
 int32_t nsWabAddressBook::mLibUsage = 0 ;
 LPWABOPEN nsWabAddressBook::mWABOpen = NULL ;
@@ -116,9 +116,3 @@ void nsWabAddressBook::FreeBuffer(LPVOID aBuffer)
 {
     mRootSession->FreeBuffer(aBuffer) ;
 }
-
-
-
-
-
-

mailnews/compose/src/nsMsgComposeService.cpp

@@ -85,7 +85,7 @@
 #define DOMAIN_DELIMITER                           ','
 
 #ifdef MSGCOMP_TRACE_PERFORMANCE
-static mozilla::LazyLogModule MsgComposeLogModule("msgcompose");
+static mozilla::LazyLogModule MsgComposeLogModule("MsgCompose");
 
 static uint32_t GetMessageSizeFromURI(const char * originalMsgURI)
 {

mailnews/db/msgdb/src/nsMailDatabase.cpp

@@ -15,10 +15,10 @@
 #include "nsMsgUtils.h"
 #include "nsIMsgPluggableStore.h"
 
-static mozilla::LazyLogModule IMAPOffline("IMAPOFFLINE");
-
 using namespace mozilla;
 
+extern LazyLogModule IMAPOffline; // defined in nsMsgOfflineImapOperation.cpp
+
 // scope for all offine ops table
 const char *kOfflineOpsScope = "ns:msg:db:row:scope:ops:all";
 const char *kOfflineOpsTableKind = "ns:msg:db:table:kind:ops";

mailnews/db/msgdb/src/nsMsgDatabase.cpp

@@ -61,7 +61,7 @@ static const nsMsgKey kFirstPseudoKey = 0xfffffff0;
 static const nsMsgKey kIdStartOfFake = 0xffffff80;
 static const nsMsgKey kForceReparseKey = 0xfffffff0;
 
-static LazyLogModule DBLog("MSGDB");
+static LazyLogModule DBLog("MsgDB");
 
 PRTime nsMsgDatabase::gLastUseTime;
 

mailnews/db/msgdb/src/nsMsgOfflineImapOperation.cpp

@@ -10,7 +10,7 @@
 
 using namespace mozilla;
 
-static LazyLogModule IMAPOffline("IMAPOFFLINE");
+LazyLogModule IMAPOffline("IMAPOffline");
 
 /* Implementation file */
 NS_IMPL_ISUPPORTS(nsMsgOfflineImapOperation, nsIMsgOfflineImapOperation)

mailnews/imap/src/nsAutoSyncManager.cpp

@@ -28,7 +28,7 @@ NS_IMPL_ISUPPORTS(nsDefaultAutoSyncMsgStrategy, nsIAutoSyncMsgStrategy)
 
 const char* kAppIdleNotification = "mail:appIdle";
 const char* kStartupDoneNotification = "mail-startup-done";
-static LazyLogModule gAutoSyncLog("ImapAutoSync");
+LazyLogModule gAutoSyncLog("IMAPAutoSync");
 
 // recommended size of each group of messages per download
 static const uint32_t kDefaultGroupSize = 50U*1024U /* 50K */;

mailnews/imap/src/nsAutoSyncState.cpp

@@ -20,7 +20,7 @@
 
 using namespace mozilla;
 
-static LazyLogModule gAutoSyncLog("ImapAutoSync");
+extern LazyLogModule gAutoSyncLog; // defined in nsAutoSyncManager.cpp
 
 MsgStrategyComparatorAdaptor::MsgStrategyComparatorAdaptor(nsIAutoSyncMsgStrategy* aStrategy, 
   nsIMsgFolder *aFolder, nsIMsgDatabase *aDatabase) : mStrategy(aStrategy), mFolder(aFolder), 

mailnews/imap/src/nsImapMailFolder.cpp

@@ -100,8 +100,8 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
 static NS_DEFINE_CID(kParseMailMsgStateCID, NS_PARSEMAILMSGSTATE_CID);
 static NS_DEFINE_CID(kCImapHostSessionList, NS_IIMAPHOSTSESSIONLIST_CID);
 
-static mozilla::LazyLogModule gAutoSyncLog("ImapAutoSync");
-static mozilla::LazyLogModule IMAP("IMAP");
+extern mozilla::LazyLogModule gAutoSyncLog; // defined in nsAutoSyncManager.cpp
+extern mozilla::LazyLogModule IMAP;         // defined in nsImapProtocol.cpp
 
 #define MAILNEWS_CUSTOM_HEADERS "mailnews.customHeaders"
 

mailnews/imap/src/nsImapProtocol.cpp

@@ -57,8 +57,6 @@
 #include "nsIXULAppInfo.h"
 #include "nsSyncRunnableHelpers.h"
 
-static mozilla::LazyLogModule IMAP("IMAP");
-
 // netlib required files
 #include "nsIStreamListener.h"
 #include "nsIMsgIncomingServer.h"
@@ -82,6 +80,8 @@ static mozilla::LazyLogModule IMAP("IMAP");
 
 using namespace mozilla;
 
+LazyLogModule IMAP("IMAP");
+
 #define ONE_SECOND ((uint32_t)1000)    // one second
 
 #define OUTPUT_BUFFER_SIZE (4096*2) // mscott - i should be able to remove this if I can use nsMsgLineBuffer???
@@ -5687,7 +5687,7 @@ nsresult nsImapProtocol::ChooseAuthMethod()
         serverCaps, m_prefAuthMethods, m_failedAuthMethods, availCaps));
   MOZ_LOG(IMAP, LogLevel::Debug, ("(GSSAPI = 0x%" PRIx64 ", CRAM = 0x%" PRIx64
         ", NTLM = 0x%" PRIx64 ", MSN = 0x%" PRIx64 ", PLAIN = 0x%" PRIx64
-        ",\n  LOGIN = 0x%" PRIx64 ", old-style IMAP login = 0x%" PRIx64
+        ", LOGIN = 0x%" PRIx64 ", old-style IMAP login = 0x%" PRIx64
         ", auth external IMAP login = 0x%" PRIx64 ", OAUTH2 = 0x%" PRIx64 ")",
         kHasAuthGssApiCapability, kHasCRAMCapability, kHasAuthNTLMCapability,
         kHasAuthMSNCapability, kHasAuthPlainCapability, kHasAuthLoginCapability,

mailnews/imap/src/nsImapServerResponseParser.cpp

@@ -19,7 +19,7 @@
 
 ////////////////// nsImapServerResponseParser /////////////////////////
 
-static mozilla::LazyLogModule IMAP("IMAP");
+extern mozilla::LazyLogModule IMAP; // defined in nsImapProtocol.cpp
 
 nsImapServerResponseParser::nsImapServerResponseParser(nsImapProtocol &imapProtocolConnection)
                             : nsIMAPGenericParser(),

mailnews/import/applemail/src/nsAppleMailImport.h

@@ -11,14 +11,7 @@
 #include "nsCOMPtr.h"
 #include "nsIStringBundle.h"
 #include "nsIImportMail.h"
-
-// logging facilities
-static mozilla::LazyLogModule APPLEMAILLOGMODULE("APPLEMAILIMPORTLOG");
-
-#define IMPORT_LOG0(x)          MOZ_LOG(APPLEMAILLOGMODULE, mozilla::LogLevel::Debug, (x))
-#define IMPORT_LOG1(x, y)       MOZ_LOG(APPLEMAILLOGMODULE, mozilla::LogLevel::Debug, (x, y))
-#define IMPORT_LOG2(x, y, z)    MOZ_LOG(APPLEMAILLOGMODULE, mozilla::LogLevel::Debug, (x, y, z))
-#define IMPORT_LOG3(a, b, c, d) MOZ_LOG(APPLEMAILLOGMODULE, mozilla::LogLevel::Debug, (a, b, c, d))
+#include "ImportDebug.h"
 
 #define NS_APPLEMAILIMPL_CID \
 { 0x9117a1ea, 0xe012, 0x43b5, { 0xa0, 0x20, 0xcb, 0x8a, 0x66, 0xcc, 0x09, 0xe1 } }

mailnews/import/outlook/src/OutlookDebugLog.h

@@ -1,23 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef OutlookDebugLog_h___
-#define OutlookDebugLog_h___
-
-#ifdef NS_DEBUG
-#define IMPORT_DEBUG  1
-#endif
-
-#include "mozilla/Logging.h"
-static mozilla::LazyLogModule OUTLOOKLOGMODULE("IMPORT");  // Logging module
-
-#define IMPORT_LOG0(x)          MOZ_LOG(OUTLOOKLOGMODULE, mozilla::LogLevel::Debug, (x))
-#define IMPORT_LOG1(x, y)       MOZ_LOG(OUTLOOKLOGMODULE, mozilla::LogLevel::Debug, (x, y))
-#define IMPORT_LOG2(x, y, z)    MOZ_LOG(OUTLOOKLOGMODULE, mozilla::LogLevel::Debug, (x, y, z))
-#define IMPORT_LOG3(a, b, c, d) MOZ_LOG(OUTLOOKLOGMODULE, mozilla::LogLevel::Debug, (a, b, c, d))
-
-
-
-#endif /* OutlookDebugLog_h___ */

mailnews/import/outlook/src/nsOutlookCompose.cpp

@@ -33,7 +33,7 @@
 #include "nsCRT.h"
 #include "nsOutlookCompose.h"
 
-#include "OutlookDebugLog.h"
+#include "ImportDebug.h"
 
 #include "nsMimeTypes.h"
 #include "nsMsgUtils.h"

mailnews/import/outlook/src/nsOutlookImport.cpp

@@ -29,7 +29,7 @@
 #include "nsTextFormatter.h"
 #include "nsOutlookStringBundle.h"
 #include "nsIStringBundle.h"
-#include "OutlookDebugLog.h"
+#include "ImportDebug.h"
 #include "nsUnicharUtils.h"
 
 #include "nsOutlookMail.h"

mailnews/import/outlook/src/nsOutlookMail.cpp

@@ -20,7 +20,7 @@
 #include "nsABBaseCID.h"
 #include "nsIAbCard.h"
 #include "mdb.h"
-#include "OutlookDebugLog.h"
+#include "ImportDebug.h"
 #include "nsOutlookMail.h"
 #include "nsUnicharUtils.h"
 #include "nsIInputStream.h"

mailnews/import/outlook/src/nsOutlookSettings.cpp

@@ -25,7 +25,7 @@
 #include "nsISmtpService.h"
 #include "nsISmtpServer.h"
 #include "nsOutlookStringBundle.h"
-#include "OutlookDebugLog.h"
+#include "ImportDebug.h"
 #include "nsIPop3IncomingServer.h"
 #include "nsMsgI18N.h"
 #include <windows.h>

mailnews/import/src/ImportDebug.h

@@ -11,7 +11,7 @@
 #endif
 
 #include "mozilla/Logging.h"
-static mozilla::LazyLogModule IMPORTLOGMODULE("IMPORT");  // Logging module
+extern mozilla::LazyLogModule IMPORTLOGMODULE;  // defined in nsImportService.cpp
 
 #define IMPORT_LOG0(x)          MOZ_LOG(IMPORTLOGMODULE, mozilla::LogLevel::Debug, (x))
 #define IMPORT_LOG1(x, y)       MOZ_LOG(IMPORTLOGMODULE, mozilla::LogLevel::Debug, (x, y))

mailnews/import/src/moz.build

@@ -21,5 +21,9 @@ SOURCES += [
     'nsImportTranslator.cpp',
 ]
 
+EXPORTS += [
+    'ImportDebug.h',
+]
+
 FINAL_LIBRARY = 'import'
 

mailnews/import/src/nsImportService.cpp

@@ -35,6 +35,8 @@
 #include "nsIMsgSend.h"
 #include "nsMsgUtils.h"
 
+mozilla::LazyLogModule IMPORTLOGMODULE("Import");
+
 static nsIImportService *  gImportService = nullptr;
 static const char *  kWhitespace = "\b\t\r\n ";
 

mailnews/import/text/src/TextDebugLog.h

@@ -1,20 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef TextDebugLog_h___
-#define TextDebugLog_h___
-
-#include "mozilla/Logging.h"
-static mozilla::LazyLogModule TEXTIMPORTLOGMODULE("IMPORT");  // Logging module
-
-#define IMPORT_LOG0(x)          MOZ_LOG(TEXTIMPORTLOGMODULE, mozilla::LogLevel::Debug, (x))
-#define IMPORT_LOG1(x, y)       MOZ_LOG(TEXTIMPORTLOGMODULE, mozilla::LogLevel::Debug, (x, y))
-#define IMPORT_LOG2(x, y, z)    MOZ_LOG(TEXTIMPORTLOGMODULE, mozilla::LogLevel::Debug, (x, y, z))
-#define IMPORT_LOG3(a, b, c, d) MOZ_LOG(TEXTIMPORTLOGMODULE, mozilla::LogLevel::Debug, (a, b, c, d))
-
-
-
-#endif /* TextDebugLog_h___ */

mailnews/import/text/src/nsTextAddress.cpp

@@ -18,7 +18,7 @@
 #include "nsIUnicharLineInputStream.h"
 #include "nsMsgUtils.h"
 
-#include "TextDebugLog.h"
+#include "ImportDebug.h"
 #include "plstr.h"
 #include "msgCore.h"
 

mailnews/import/text/src/nsTextImport.cpp

@@ -32,7 +32,7 @@
 #include "nsTextAddress.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
-#include "TextDebugLog.h"
+#include "ImportDebug.h"
 #include "nsNetUtil.h"
 #include "nsMsgUtils.h"
 

mailnews/import/vcard/src/nsVCardAddress.h

@@ -5,14 +5,7 @@
 #ifndef nsVCardAddress_h__
 #define nsVCardAddress_h__
 
-#include "mozilla/Logging.h"
-
-static mozilla::LazyLogModule VCARDLOGMODULE("IMPORT");  // Logging module
-
-#define IMPORT_LOG0(x)          MOZ_LOG(VCARDLOGMODULE, mozilla::LogLevel::Debug, (x))
-#define IMPORT_LOG1(x, y)       MOZ_LOG(VCARDLOGMODULE, mozilla::LogLevel::Debug, (x, y))
-#define IMPORT_LOG2(x, y, z)    MOZ_LOG(VCARDLOGMODULE, mozilla::LogLevel::Debug, (x, y, z))
-#define IMPORT_LOG3(a, b, c, d) MOZ_LOG(VCARDLOGMODULE, mozilla::LogLevel::Debug, (a, b, c, d))
+#include "ImportDebug.h"
 
 class nsIAddrDatabase;
 class nsIFile;

mailnews/import/winlivemail/WMDebugLog.h

@@ -1,19 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef WMDebugLog_h___
-#define WMDebugLog_h___
-
-#include "mozilla/Logging.h"
-static mozilla::LazyLogModule WMLOGMODULE("IMPORT");  // Logging module
-
-#define IMPORT_LOG0(x)          MOZ_LOG(WMLOGMODULE, mozilla::LogLevel::Debug, (x))
-#define IMPORT_LOG1(x, y)       MOZ_LOG(WMLOGMODULE, mozilla::LogLevel::Debug, (x, y))
-#define IMPORT_LOG2(x, y, z)    MOZ_LOG(WMLOGMODULE, mozilla::LogLevel::Debug, (x, y, z))
-#define IMPORT_LOG3(a, b, c, d) MOZ_LOG(WMLOGMODULE, mozilla::LogLevel::Debug, (a, b, c, d))
-
-
-
-#endif /* WMDebugLog_h___ */

mailnews/import/winlivemail/nsWMImport.cpp

@@ -33,7 +33,7 @@
 #include "nsIStringBundle.h"
 #include "nsUnicharUtils.h"
 
-#include "WMDebugLog.h"
+#include "ImportDebug.h"
 
 class ImportWMMailImpl : public nsIImportMail
 {

mailnews/import/winlivemail/nsWMSettings.cpp

@@ -26,7 +26,7 @@
 #include "nsISmtpService.h"
 #include "nsISmtpServer.h"
 #include "nsWMStringBundle.h"
-#include "WMDebugLog.h"
+#include "ImportDebug.h"
 #include "nsIPop3IncomingServer.h"
 #include "nsIImapIncomingServer.h"
 #include "nsINntpIncomingServer.h"

mailnews/import/winlivemail/nsWMUtils.cpp

@@ -14,7 +14,7 @@
 #include "nsIFileStreams.h"
 #include "nsIFile.h"
 #include "nsISimpleEnumerator.h"
-#include "WMDebugLog.h"
+#include "ImportDebug.h"
 #include "prio.h"
 
 nsresult

mailnews/local/src/nsMailboxProtocol.cpp

@@ -38,7 +38,7 @@
 
 using namespace mozilla;
 
-static LazyLogModule MAILBOX("MAILBOX");
+static LazyLogModule MAILBOX("Mailbox");
 
 /* the output_buffer_size must be larger than the largest possible line
  * 2000 seems good for news

mailnews/local/src/nsPop3Protocol.cpp

@@ -50,7 +50,7 @@
 
 using namespace mozilla;
 
-static mozilla::LazyLogModule POP3LOGMODULE("POP3");
+LazyLogModule POP3LOGMODULE("POP3");
 #define POP3LOG(str) "[this=%p] " str, this
 
 static int

mailnews/local/src/nsPop3Sink.cpp

@@ -43,7 +43,7 @@
 #include "nsIScriptError.h"
 #include "nsIConsoleService.h"
 
-static mozilla::LazyLogModule POP3LOGMODULE("POP3");
+extern mozilla::LazyLogModule POP3LOGMODULE; //defined in nsPop3Protocol.cpp
 #define POP3LOG(str) "sink: [this=%p] " str, this
 
 NS_IMPL_ISUPPORTS(nsPop3Sink, nsIPop3Sink)

mailnews/mapi/mapihook/src/msgMapiHook.cpp

@@ -47,7 +47,7 @@
 #include "nsEmbedCID.h"
 #include "mozilla/Logging.h"
 
-static mozilla::LazyLogModule MAPI("MAPI");
+extern mozilla::LazyLogModule MAPI; // defined in msgMapiImp.cpp
 
 class nsMAPISendListener : public nsIMsgSendListener
 {

mailnews/mapi/mapihook/src/msgMapiImp.cpp

@@ -36,7 +36,7 @@
 
 using namespace mozilla::mailnews;
 
-static mozilla::LazyLogModule MAPI("MAPI");
+mozilla::LazyLogModule MAPI("MAPI");
 
 CMapiImp::CMapiImp()
 : m_cRef(1)