more #define clean up
git-svn-id: svn://10.0.0.236/trunk@39900 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
282f875a0b
commit
17805faa7a
@ -420,7 +420,7 @@ nsMessenger::OpenURL(const char * url)
|
||||
{
|
||||
if (url)
|
||||
{
|
||||
#ifdef DEBUG_sspitzer
|
||||
#if defined(DEBUG_sspitzer) || defined(DEBUG_seth)
|
||||
printf("nsMessenger::OpenURL(%s)\n",url);
|
||||
#endif
|
||||
nsIMsgMessageService * messageService = nsnull;
|
||||
|
||||
@ -23,6 +23,10 @@
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsString.h"
|
||||
|
||||
#if defined(DEBUG_sspitzer_) || defined(DEBUG_seth)
|
||||
#define NS_MsgHashIfNecessary 1
|
||||
#endif
|
||||
|
||||
nsresult GetMessageServiceProgIDForURI(const char *uri, nsString &progID)
|
||||
{
|
||||
|
||||
@ -245,7 +249,7 @@ nsresult NS_MsgHashIfNecessary(nsString &name)
|
||||
#endif
|
||||
nsAutoString str(name, eOneByte);
|
||||
|
||||
#ifdef DEBUG_sspitzer_
|
||||
#ifdef DEBUG_NS_MsgHashIfNecessary
|
||||
printf("in: %s\n",str.GetBuffer());
|
||||
#endif
|
||||
|
||||
@ -266,7 +270,7 @@ nsresult NS_MsgHashIfNecessary(nsString &name)
|
||||
(unsigned long) StringHash(str.GetBuffer()));
|
||||
}
|
||||
name = hashedname;
|
||||
#ifdef DEBUG_sspitzer_
|
||||
#ifdef DEBUG_NS_MsgHashIfNecessary
|
||||
printf("out: %s\n",hashedname);
|
||||
#endif
|
||||
|
||||
|
||||
@ -74,11 +74,6 @@
|
||||
|
||||
#define DEFAULT_NEWS_CHUNK_SIZE -1
|
||||
|
||||
#ifdef DEBUG_sspitzer_
|
||||
#define DEBUG_NEWS 1
|
||||
#endif
|
||||
|
||||
|
||||
// move these to a string bundle
|
||||
#define UNTIL_STRING_BUNDLES_XP_HTML_NEWS_ERROR "<TITLE>Error!</TITLE>\n<H1>Error!</H1> newsgroup server responded: <b>%.256s</b><p>\n"
|
||||
#define UNTIL_STRING_BUNDLES_XP_HTML_ARTICLE_EXPIRED "<b><p>Perhaps the article has expired</b><p>\n"
|
||||
@ -2918,7 +2913,7 @@ PRInt32 nsNNTPProtocol::FigureNextChunk()
|
||||
|
||||
rv = m_newsgroup->GetName(&groupName);
|
||||
|
||||
#ifdef DEBUG_sspitzer
|
||||
#ifdef DEBUG_NEWS
|
||||
printf("leaking group name?\n");
|
||||
#endif
|
||||
|
||||
@ -3985,8 +3980,8 @@ PRInt32 nsNNTPProtocol::Cancel()
|
||||
#endif /* BUG_7770_FIXED */
|
||||
}
|
||||
|
||||
#ifdef DEBUG_NEWS
|
||||
// just me for now...
|
||||
#ifdef DEBUG_sspitzer
|
||||
// delete the message from the db here.
|
||||
nsMsgKey key = nsMsgKey_None;
|
||||
rv = m_runningURL->GetMessageKey(&key);
|
||||
|
||||
@ -637,7 +637,7 @@ nsresult nsNntpService::PostMessage(nsFilePath &pathToFile, const char *newsgrou
|
||||
nsresult
|
||||
nsNntpService::RunNewsUrl(nsString& urlString, nsString &newsgroupName, nsMsgKey key, nsISupports * aConsumer, nsIUrlListener *aUrlListener, nsIURI **_retval)
|
||||
{
|
||||
#ifdef DEBUG_sspitzer
|
||||
#ifdef DEBUG_NEWS
|
||||
printf("nsNntpService::RunNewsUrl(%s,%s,%u,...)\n", (const char *)nsAutoCString(urlString), (const char *)nsAutoCString(newsgroupName), key);
|
||||
#endif
|
||||
|
||||
|
||||
@ -81,7 +81,7 @@ protected:
|
||||
|
||||
newsTestDriver::newsTestDriver()
|
||||
{
|
||||
#ifdef DEBUG_sspitzer
|
||||
#ifdef DEBUG_NEWS
|
||||
printf("in newsTestDriver::newsTestDriver()\n");
|
||||
#endif
|
||||
m_newsDB = nsnull;
|
||||
@ -89,7 +89,7 @@ newsTestDriver::newsTestDriver()
|
||||
|
||||
newsTestDriver::~newsTestDriver()
|
||||
{
|
||||
#ifdef DEBUG_sspitzer
|
||||
#ifdef DEBUG_NEWS
|
||||
printf("in newsTestDriver::~newsTestDriver()\n");
|
||||
#endif
|
||||
}
|
||||
@ -133,7 +133,7 @@ nsresult newsTestDriver::AddNewHeader(const char *subject, const char *author, c
|
||||
|
||||
m_newsDB->CreateNewHdr(key, getter_AddRefs(newMsgHdr));
|
||||
if (NS_FAILED(rv)) {
|
||||
#ifdef DEBUG_sspitzer
|
||||
#ifdef DEBUG_NEWS
|
||||
printf("m_newsDB->CreateNewHdr() failed\n");
|
||||
#endif
|
||||
return rv;
|
||||
@ -146,7 +146,7 @@ nsresult newsTestDriver::AddNewHeader(const char *subject, const char *author, c
|
||||
|
||||
rv = m_newsDB->AddNewHdrToDB(newMsgHdr, PR_TRUE);
|
||||
if (NS_FAILED(rv)) {
|
||||
#ifdef DEBUG_sspitzer
|
||||
#ifdef DEBUG_NEWS
|
||||
printf("m_newsDB->AddNewHdrToDB() failed\n");
|
||||
#endif
|
||||
return rv;
|
||||
@ -161,7 +161,7 @@ nsresult newsTestDriver::GetPath(const char *uri, nsFileSpec& aPathName)
|
||||
|
||||
rv = nsNewsURI2Path(kNewsRootURI, uri, aPathName);
|
||||
|
||||
#ifdef DEBUG_sspitzer
|
||||
#ifdef DEBUG_NEWS
|
||||
printf("newsTestDriver::GetPath(%s,??) -> %s\n", uri, (const char *)aPathName);
|
||||
#endif
|
||||
|
||||
@ -181,7 +181,7 @@ nsresult newsTestDriver::GetDatabase(const char *uri)
|
||||
rv = nsComponentManager::CreateInstance(kCNewsDB, nsnull, nsIMsgDatabase::GetIID(), getter_AddRefs(newsDBFactory));
|
||||
if (NS_SUCCEEDED(rv) && newsDBFactory) {
|
||||
newsDBOpen = newsDBFactory->Open(path, PR_TRUE, PR_FALSE, getter_AddRefs(m_newsDB));
|
||||
#ifdef DEBUG_sspitzer
|
||||
#ifdef DEBUG_NEWS
|
||||
if (NS_SUCCEEDED(newsDBOpen)) {
|
||||
printf ("newsDBFactory->Open() succeeded\n");
|
||||
}
|
||||
@ -191,7 +191,7 @@ nsresult newsTestDriver::GetDatabase(const char *uri)
|
||||
#endif
|
||||
return rv;
|
||||
}
|
||||
#ifdef DEBUG_sspitzer
|
||||
#ifdef DEBUG_NEWS
|
||||
else {
|
||||
printf("nsComponentManager::CreateInstance(kCNewsDB,...) failed\n");
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user