Index: base/search/src/nsMsgSearchAdapter.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/search/src/nsMsgSearchAdapter.cpp,v retrieving revision 1.83 diff -u -p -r1.83 nsMsgSearchAdapter.cpp --- base/search/src/nsMsgSearchAdapter.cpp 9 Jun 2006 14:26:30 -0000 1.83 +++ base/search/src/nsMsgSearchAdapter.cpp 14 Sep 2006 10:51:38 -0000 @@ -549,7 +549,7 @@ nsresult nsMsgSearchAdapter::EncodeImapT } } - char *value = ""; + char *value = nsnull; char dateBuf[100]; dateBuf[0] = '\0'; @@ -686,10 +686,20 @@ nsresult nsMsgSearchAdapter::EncodeImapT } // this should be rewritten to use nsCString - int len = strlen(whichMnemonic) + strlen(value) + (useNot ? strlen(m_kImapNot) : 0) + + int len = strlen(whichMnemonic) + + (value ? strlen(value) : 0) + + (useNot ? strlen(m_kImapNot) : 0) + (useQuotes ? 2 : 0) + strlen(m_kImapHeader) + - (orHeaderMnemonic ? (strlen(m_kImapHeader) + strlen(m_kImapOr) + (useNot ? strlen(m_kImapNot) : 0) + - strlen(orHeaderMnemonic) + strlen(value) + 2 /*""*/) : 0) + 10; // add slough for imap string literals + (orHeaderMnemonic ? + (strlen(m_kImapHeader) + + strlen(m_kImapOr) + + (useNot ? strlen(m_kImapNot) : 0) + + strlen(orHeaderMnemonic) + + (value ? strlen(value) : 0) + + 2 /*""*/ + ) : + 0) + + 10; // add slough for imap string literals char *encoding = new char[len]; if (encoding) { @@ -724,7 +734,7 @@ nsresult nsMsgSearchAdapter::EncodeImapT } if (value && valueWasAllocated) - PR_Free (value); + nsCRT::free (value); *ppOutTerm = encoding; Index: base/util/nsMsgKeySet.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/util/nsMsgKeySet.cpp,v retrieving revision 1.23 diff -u -p -r1.23 nsMsgKeySet.cpp --- base/util/nsMsgKeySet.cpp 5 Apr 2006 00:00:41 -0000 1.23 +++ base/util/nsMsgKeySet.cpp 14 Sep 2006 10:51:39 -0000 @@ -1278,7 +1278,7 @@ nsMsgKeySet::test_decoder (const char *s void nsMsgKeySet::test_adder (void) { - char *string; + const char *string; nsMsgKeySet *set; char *s; PRInt32 i; Index: compose/src/nsMsgSend.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgSend.cpp,v retrieving revision 1.381 diff -u -p -r1.381 nsMsgSend.cpp --- compose/src/nsMsgSend.cpp 18 Jun 2006 17:46:46 -0000 1.381 +++ compose/src/nsMsgSend.cpp 14 Sep 2006 10:51:43 -0000 @@ -1398,7 +1398,7 @@ nsresult nsMsgComposeAndSend::BeginCrypt #endif // XP_MAC && DEBUG nsresult -mime_write_message_body(nsIMsgSend *state, char *buf, PRInt32 size) +mime_write_message_body(nsIMsgSend *state, const char *buf, PRInt32 size) { NS_ENSURE_ARG_POINTER(state); @@ -1741,7 +1741,7 @@ nsMsgComposeAndSend::GetBodyFromEditor() nsCString attachment1_body; // we'd better be "text/html" at this point - char *attachment1_type = TEXT_HTML; + const char *attachment1_type = TEXT_HTML; // Convert body to mail charset nsXPIDLCString outCString; Index: compose/src/nsMsgSend.h =================================================================== RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgSend.h,v retrieving revision 1.80 diff -u -p -r1.80 nsMsgSend.h --- compose/src/nsMsgSend.h 27 Nov 2005 23:57:18 -0000 1.80 +++ compose/src/nsMsgSend.h 14 Sep 2006 10:51:44 -0000 @@ -427,7 +427,7 @@ private: // // These C routines should only be used by the nsMsgSendPart class. // -extern nsresult mime_write_message_body(nsIMsgSend *state, char *buf, PRInt32 size); +extern nsresult mime_write_message_body(nsIMsgSend *state, const char *buf, PRInt32 size); extern char *mime_get_stream_write_buffer(void); extern nsresult PR_CALLBACK mime_encoder_output_fn (const char *buf, PRInt32 size, void *closure); extern PRBool UseQuotedPrintable(void); Index: imap/src/nsIMAPGenericParser.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/imap/src/nsIMAPGenericParser.cpp,v retrieving revision 1.53 diff -u -p -r1.53 nsIMAPGenericParser.cpp --- imap/src/nsIMAPGenericParser.cpp 30 Jun 2006 01:56:19 -0000 1.53 +++ imap/src/nsIMAPGenericParser.cpp 14 Sep 2006 10:51:45 -0000 @@ -74,7 +74,7 @@ void nsIMAPGenericParser::ResetLexAnalyz PR_FREEIF( fCurrentLine ); PR_FREEIF( fStartOfLineOfTokens ); - fCurrentLine = fNextToken = fLineOfTokens = fStartOfLineOfTokens = fCurrentTokenPlaceHolder = nsnull; + fNextToken = fCurrentLine = fLineOfTokens = fStartOfLineOfTokens = fCurrentTokenPlaceHolder = nsnull; fAtEndOfLine = PR_FALSE; } @@ -118,7 +118,7 @@ void nsIMAPGenericParser::skip_to_close_ while (ContinueParse()) { // go through fNextToken, account for nested parens - char *loc; + const char *loc; for (loc = fNextToken; loc && *loc; loc++) { if (*loc == '(') Index: imap/src/nsIMAPGenericParser.h =================================================================== RCS file: /cvsroot/mozilla/mailnews/imap/src/nsIMAPGenericParser.h,v retrieving revision 1.16 diff -u -p -r1.16 nsIMAPGenericParser.h --- imap/src/nsIMAPGenericParser.h 17 Feb 2006 22:56:55 -0000 1.16 +++ imap/src/nsIMAPGenericParser.h 14 Sep 2006 10:51:45 -0000 @@ -91,7 +91,7 @@ protected: protected: // use with care - char *fNextToken; + const char *fNextToken; char *fCurrentLine; char *fLineOfTokens; char *fStartOfLineOfTokens; Index: imap/src/nsImapServerResponseParser.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/imap/src/nsImapServerResponseParser.cpp,v retrieving revision 1.139 diff -u -p -r1.139 nsImapServerResponseParser.cpp --- imap/src/nsImapServerResponseParser.cpp 18 Aug 2006 20:16:12 -0000 1.139 +++ imap/src/nsImapServerResponseParser.cpp 14 Sep 2006 10:51:48 -0000 @@ -204,7 +204,7 @@ void nsImapServerResponseParser::ParseIM { char *placeInTokenString = nsnull; char *tagToken = nsnull; - char *commandToken = nsnull; + const char *commandToken = nsnull; PRBool inIdle = PR_FALSE; if (!sendingIdleDone) { @@ -1136,7 +1136,7 @@ void nsImapServerResponseParser::msg_fet char *whereHeader = PL_strstr(fNextToken, "HEADER"); if (whereHeader) { - char *startPartNum = fNextToken + 5; + const char *startPartNum = fNextToken + 5; if (whereHeader > startPartNum) { PRInt32 partLength = whereHeader - startPartNum - 1; //-1 for the dot! @@ -2313,7 +2313,7 @@ void nsImapServerResponseParser::namespa char *namespacePrefix = CreateQuoted(PR_FALSE); AdvanceToNextToken(); - char *quotedDelimiter = fNextToken; + const char *quotedDelimiter = fNextToken; char namespaceDelimiter = '\0'; if (quotedDelimiter[0] == '"') Index: local/src/nsLocalUndoTxn.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/local/src/nsLocalUndoTxn.cpp,v retrieving revision 1.45 diff -u -p -r1.45 nsLocalUndoTxn.cpp --- local/src/nsLocalUndoTxn.cpp 9 Aug 2006 00:54:55 -0000 1.45 +++ local/src/nsLocalUndoTxn.cpp 14 Sep 2006 10:51:48 -0000 @@ -465,11 +465,11 @@ NS_IMETHODIMP nsLocalUndoFolderListener: return NS_OK; } -NS_IMETHODIMP nsLocalUndoFolderListener::OnItemEvent(nsIMsgFolder *item, nsIAtom *event) +NS_IMETHODIMP nsLocalUndoFolderListener::OnItemEvent(nsIMsgFolder *item, nsIAtom *aEvent) { nsCOMPtr folderLoadedAtom = do_GetAtom("FolderLoaded"); nsCOMPtr itemFolder = do_QueryInterface(item); - if (mTxn && mFolder && folderLoadedAtom == event && item == mFolder) + if (mTxn && mFolder && folderLoadedAtom == aEvent && item == mFolder) return mTxn->UndoTransactionInternal(); return NS_ERROR_FAILURE; Index: mime/cthandlers/glue/mimexpcom.h =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/cthandlers/glue/mimexpcom.h,v retrieving revision 1.6 diff -u -p -r1.6 mimexpcom.h --- mime/cthandlers/glue/mimexpcom.h 15 Apr 2005 17:52:50 -0000 1.6 +++ mime/cthandlers/glue/mimexpcom.h 14 Sep 2006 10:51:48 -0000 @@ -106,7 +106,7 @@ /* * This is the write call for outputting processed stream data. */ -extern "C" int COM_MimeObject_write(void *mimeObject, char *data, +extern "C" int COM_MimeObject_write(void *mimeObject, const char *data, PRInt32 length, PRBool user_visible_p); /* Index: mime/cthandlers/vcard/mimevcrd.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp,v retrieving revision 1.94 diff -u -p -r1.94 mimevcrd.cpp --- mime/cthandlers/vcard/mimevcrd.cpp 14 Jul 2005 19:01:38 -0000 1.94 +++ mime/cthandlers/vcard/mimevcrd.cpp 14 Sep 2006 10:51:50 -0000 @@ -67,7 +67,7 @@ static nsCOMPtr stringBundle = nsnull; #endif -static int MimeInlineTextVCard_parse_line (char *, PRInt32, MimeObject *); +static int MimeInlineTextVCard_parse_line (const char *, PRInt32, MimeObject *); static int MimeInlineTextVCard_parse_eof (MimeObject *, PRBool); static int MimeInlineTextVCard_parse_begin (MimeObject *obj); @@ -170,7 +170,7 @@ char *strcpySafe (char *dest, const char } static int -MimeInlineTextVCard_parse_line (char *line, PRInt32 length, MimeObject *obj) +MimeInlineTextVCard_parse_line (const char *line, PRInt32 length, MimeObject *obj) { // This routine gets fed each line of data, one at a time. char* linestring; @@ -357,7 +357,7 @@ static int WriteEachLineToStream (MimeOb return status; } -static int OutputTable (MimeObject *obj, PRBool endTable, PRBool border, char *cellspacing, char *cellpadding, char *bgcolor) +static int OutputTable (MimeObject *obj, PRBool endTable, PRBool border, const char *cellspacing, const char *cellpadding, const char *bgcolor) { int status = 0; char * htmlLine = NULL; @@ -418,9 +418,9 @@ static int OutputTable (MimeObject *obj, } static int OutputTableRowOrData(MimeObject *obj, PRBool outputRow, - PRBool end, char * align, - char* valign, char* colspan, - char* width) + PRBool end, const char * align, + const char* valign, const char* colspan, + const char* width) { int status = 0; char * htmlLine = NULL; @@ -488,7 +488,7 @@ static int OutputTableRowOrData(MimeObje } -static int OutputFont(MimeObject *obj, PRBool endFont, char * size, char* color) +static int OutputFont(MimeObject *obj, PRBool endFont, const char * size, const char* color) { int status = 0; char * htmlLine = NULL; @@ -1910,9 +1910,7 @@ nsCOMPtr stringBundle if (!stringBundle) { - char* propertyURL = NULL; - - propertyURL = VCARD_URL; + const char* propertyURL = VCARD_URL; nsCOMPtr sBundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &res); Index: mime/src/mimecom.h =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimecom.h,v retrieving revision 1.5 diff -u -p -r1.5 mimecom.h --- mime/src/mimecom.h 17 Apr 2004 18:33:13 -0000 1.5 +++ mime/src/mimecom.h 14 Sep 2006 10:51:50 -0000 @@ -50,7 +50,7 @@ /* * This is the write call for outputting processed stream data. */ -extern "C" int XPCOM_MimeObject_write(void *mimeObject, char *data, +extern "C" int XPCOM_MimeObject_write(void *mimeObject, const char *data, PRInt32 length, PRBool user_visible_p); /* Index: mime/src/mimecryp.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimecryp.cpp,v retrieving revision 1.9 diff -u -p -r1.9 mimecryp.cpp --- mime/src/mimecryp.cpp 25 Jan 2006 22:48:07 -0000 1.9 +++ mime/src/mimecryp.cpp 14 Sep 2006 10:51:50 -0000 @@ -55,7 +55,7 @@ static int MimeEncrypted_initialize (Mim static void MimeEncrypted_finalize (MimeObject *); static int MimeEncrypted_parse_begin (MimeObject *); static int MimeEncrypted_parse_buffer (const char *, PRInt32, MimeObject *); -static int MimeEncrypted_parse_line (char *, PRInt32, MimeObject *); +static int MimeEncrypted_parse_line (const char *, PRInt32, MimeObject *); static int MimeEncrypted_parse_decoded_buffer (const char *, PRInt32, MimeObject *); static int MimeEncrypted_parse_eof (MimeObject *, PRBool); static int MimeEncrypted_parse_end (MimeObject *, PRBool); @@ -177,7 +177,7 @@ MimeEncrypted_parse_buffer (const char * static int -MimeEncrypted_parse_line (char *line, PRInt32 length, MimeObject *obj) +MimeEncrypted_parse_line (const char *line, PRInt32 length, MimeObject *obj) { NS_ASSERTION(0, "1.2 01 Nov 2001 17:59"); /* This method shouldn't ever be called. */ Index: mime/src/mimedrft.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimedrft.cpp,v retrieving revision 1.148 diff -u -p -r1.148 mimedrft.cpp --- mime/src/mimedrft.cpp 18 Aug 2006 21:40:29 -0000 1.148 +++ mime/src/mimedrft.cpp 14 Sep 2006 10:51:51 -0000 @@ -682,9 +682,9 @@ mime_fix_up_html_address( char **addr) static void mime_intl_insert_message_header_1(char **body, char **hdr_value, - char *hdr_str, + const char *hdr_str, const char *html_hdr_str, - char *mailcharset, + const char *mailcharset, PRBool htmlEdit) { if (!body || !hdr_value || !hdr_str) Index: mime/src/mimeebod.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimeebod.cpp,v retrieving revision 1.24 diff -u -p -r1.24 mimeebod.cpp --- mime/src/mimeebod.cpp 18 Apr 2004 13:54:19 -0000 1.24 +++ mime/src/mimeebod.cpp 14 Sep 2006 10:51:51 -0000 @@ -59,7 +59,7 @@ extern MimeObjectClass mimeMultipartAppl static int MimeExternalBody_initialize (MimeObject *); static void MimeExternalBody_finalize (MimeObject *); -static int MimeExternalBody_parse_line (char *, PRInt32, MimeObject *); +static int MimeExternalBody_parse_line (const char *, PRInt32, MimeObject *); static int MimeExternalBody_parse_eof (MimeObject *, PRBool); static PRBool MimeExternalBody_displayable_inline_p (MimeObjectClass *clazz, MimeHeaders *hdrs); @@ -113,7 +113,7 @@ MimeExternalBody_finalize (MimeObject *o } static int -MimeExternalBody_parse_line (char *line, PRInt32 length, MimeObject *obj) +MimeExternalBody_parse_line (const char *line, PRInt32 length, MimeObject *obj) { MimeExternalBody *bod = (MimeExternalBody *) obj; int status = 0; Index: mime/src/mimeeobj.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimeeobj.cpp,v retrieving revision 1.18 diff -u -p -r1.18 mimeeobj.cpp --- mime/src/mimeeobj.cpp 17 Apr 2004 18:33:13 -0000 1.18 +++ mime/src/mimeeobj.cpp 14 Sep 2006 10:51:52 -0000 @@ -55,7 +55,7 @@ static int MimeExternalObject_initialize static void MimeExternalObject_finalize (MimeObject *); static int MimeExternalObject_parse_begin (MimeObject *); static int MimeExternalObject_parse_buffer (const char *, PRInt32, MimeObject *); -static int MimeExternalObject_parse_line (char *, PRInt32, MimeObject *); +static int MimeExternalObject_parse_line (const char *, PRInt32, MimeObject *); static int MimeExternalObject_parse_decoded_buffer (const char*, PRInt32, MimeObject*); static PRBool MimeExternalObject_displayable_inline_p (MimeObjectClass *clazz, MimeHeaders *hdrs); @@ -259,7 +259,7 @@ MimeExternalObject_parse_decoded_buffer static int -MimeExternalObject_parse_line (char *line, PRInt32 length, MimeObject *obj) +MimeExternalObject_parse_line (const char *line, PRInt32 length, MimeObject *obj) { /* This method should never be called (externals do no line buffering). */ Index: mime/src/mimehdrs.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimehdrs.cpp,v retrieving revision 1.70 diff -u -p -r1.70 mimehdrs.cpp --- mime/src/mimehdrs.cpp 25 Nov 2005 08:16:43 -0000 1.70 +++ mime/src/mimehdrs.cpp 14 Sep 2006 10:51:52 -0000 @@ -747,7 +747,7 @@ MimeHeaders_get_name(MimeHeaders *hdrs, void MimeHeaders_do_unix_display_hook_hack(MimeHeaders *hdrs) { - static char *cmd = 0; + static const char *cmd = 0; if (!cmd) { /* The first time we're invoked, look up the command in the @@ -755,8 +755,6 @@ MimeHeaders_do_unix_display_hook_hack(Mi cmd = getenv("NS_MSG_DISPLAY_HOOK"); if (!cmd) cmd = ""; - else - cmd = nsCRT::strdup(cmd); } /* Invoke "cmd" at the end of a pipe, and give it the headers on stdin. Index: mime/src/mimeiimg.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimeiimg.cpp,v retrieving revision 1.20 diff -u -p -r1.20 mimeiimg.cpp --- mime/src/mimeiimg.cpp 17 Apr 2004 18:33:13 -0000 1.20 +++ mime/src/mimeiimg.cpp 14 Sep 2006 10:51:53 -0000 @@ -52,7 +52,7 @@ MimeDefClass(MimeInlineImage, MimeInline static int MimeInlineImage_initialize (MimeObject *); static void MimeInlineImage_finalize (MimeObject *); static int MimeInlineImage_parse_begin (MimeObject *); -static int MimeInlineImage_parse_line (char *, PRInt32, MimeObject *); +static int MimeInlineImage_parse_line (const char *, PRInt32, MimeObject *); static int MimeInlineImage_parse_eof (MimeObject *, PRBool); static int MimeInlineImage_parse_decoded_buffer (const char *, PRInt32, MimeObject *); @@ -267,7 +267,7 @@ MimeInlineImage_parse_decoded_buffer (co static int -MimeInlineImage_parse_line (char *line, PRInt32 length, MimeObject *obj) +MimeInlineImage_parse_line (const char *line, PRInt32 length, MimeObject *obj) { /* This method should never be called (inline images do no line buffering). */ Index: mime/src/mimeleaf.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimeleaf.cpp,v retrieving revision 1.16 diff -u -p -r1.16 mimeleaf.cpp --- mime/src/mimeleaf.cpp 25 Jan 2006 22:48:07 -0000 1.16 +++ mime/src/mimeleaf.cpp 14 Sep 2006 10:51:53 -0000 @@ -51,7 +51,7 @@ static int MimeLeaf_initialize (MimeObje static void MimeLeaf_finalize (MimeObject *); static int MimeLeaf_parse_begin (MimeObject *); static int MimeLeaf_parse_buffer (const char *, PRInt32, MimeObject *); -static int MimeLeaf_parse_line (char *, PRInt32, MimeObject *); +static int MimeLeaf_parse_line (const char *, PRInt32, MimeObject *); static int MimeLeaf_close_decoder (MimeObject *); static int MimeLeaf_parse_eof (MimeObject *, PRBool); static PRBool MimeLeaf_displayable_inline_p (MimeObjectClass *clazz, @@ -179,7 +179,7 @@ MimeLeaf_parse_buffer (const char *buffe } static int -MimeLeaf_parse_line (char *line, PRInt32 length, MimeObject *obj) +MimeLeaf_parse_line (const char *line, PRInt32 length, MimeObject *obj) { NS_ASSERTION(0, "1.1 19 Mar 1999 12:00"); /* This method shouldn't ever be called. */ Index: mime/src/mimemalt.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimemalt.cpp,v retrieving revision 1.22 diff -u -p -r1.22 mimemalt.cpp --- mime/src/mimemalt.cpp 26 Sep 2005 22:46:13 -0000 1.22 +++ mime/src/mimemalt.cpp 14 Sep 2006 10:51:53 -0000 @@ -56,7 +56,7 @@ static int MimeMultipartAlternative_init static void MimeMultipartAlternative_finalize (MimeObject *); static int MimeMultipartAlternative_parse_eof (MimeObject *, PRBool); static int MimeMultipartAlternative_create_child(MimeObject *); -static int MimeMultipartAlternative_parse_child_line (MimeObject *, char *, +static int MimeMultipartAlternative_parse_child_line (MimeObject *, const char *, PRInt32, PRBool); static int MimeMultipartAlternative_close_child(MimeObject *); @@ -182,7 +182,7 @@ MimeMultipartAlternative_create_child(Mi static int MimeMultipartAlternative_parse_child_line (MimeObject *obj, - char *line, PRInt32 length, + const char *line, PRInt32 length, PRBool first_line_p) { MimeMultipartAlternative *malt = (MimeMultipartAlternative *) obj; Index: mime/src/mimemcms.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimemcms.cpp,v retrieving revision 1.25 diff -u -p -r1.25 mimemcms.cpp --- mime/src/mimemcms.cpp 4 Apr 2006 13:15:49 -0000 1.25 +++ mime/src/mimemcms.cpp 14 Sep 2006 10:51:54 -0000 @@ -62,8 +62,8 @@ MimeDefClass(MimeMultipartSignedCMS, Mim static int MimeMultipartSignedCMS_initialize (MimeObject *); static void *MimeMultCMS_init (MimeObject *); -static int MimeMultCMS_data_hash (char *, PRInt32, void *); -static int MimeMultCMS_sig_hash (char *, PRInt32, void *); +static int MimeMultCMS_data_hash (const char *, PRInt32, void *); +static int MimeMultCMS_sig_hash (const char *, PRInt32, void *); static int MimeMultCMS_data_eof (void *, PRBool); static int MimeMultCMS_sig_eof (void *, PRBool); static int MimeMultCMS_sig_init (void *, MimeObject *, MimeHeaders *); @@ -279,7 +279,7 @@ MimeMultCMS_init (MimeObject *obj) } static int -MimeMultCMS_data_hash (char *buf, PRInt32 size, void *crypto_closure) +MimeMultCMS_data_hash (const char *buf, PRInt32 size, void *crypto_closure) { MimeMultCMSdata *data = (MimeMultCMSdata *) crypto_closure; if (!data || !data->data_hash_context) { @@ -360,7 +360,7 @@ MimeMultCMS_sig_init (void *crypto_closu static int -MimeMultCMS_sig_hash (char *buf, PRInt32 size, void *crypto_closure) +MimeMultCMS_sig_hash (const char *buf, PRInt32 size, void *crypto_closure) { MimeMultCMSdata *data = (MimeMultCMSdata *) crypto_closure; nsresult rv; Index: mime/src/mimemoz2.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimemoz2.cpp,v retrieving revision 1.220 diff -u -p -r1.220 mimemoz2.cpp --- mime/src/mimemoz2.cpp 18 Jun 2006 21:18:20 -0000 1.220 +++ mime/src/mimemoz2.cpp 14 Sep 2006 10:51:55 -0000 @@ -1996,9 +1996,7 @@ MimeGetStringByID(PRInt32 stringID) if (!stringBundle) { - char* propertyURL = NULL; - - propertyURL = MIME_URL; + const char* propertyURL = MIME_URL; nsCOMPtr sBundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &res); Index: mime/src/mimemoz2.h =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimemoz2.h,v retrieving revision 1.48 diff -u -p -r1.48 mimemoz2.h --- mime/src/mimemoz2.h 15 Feb 2005 00:31:07 -0000 1.48 +++ mime/src/mimemoz2.h 14 Sep 2006 10:51:55 -0000 @@ -84,11 +84,11 @@ typedef void /* streamclass function */ struct _nsMIMESession { - char * name; /* Just for diagnostics */ + const char * name; /* Just for diagnostics */ - void * window_id; /* used for progress messages, etc. */ + void * window_id; /* used for progress messages, etc. */ - void * data_object; /* a pointer to whatever + void * data_object; /* a pointer to whatever * structure you wish to have * passed to the routines below * during writes, etc... Index: mime/src/mimemrel.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimemrel.cpp,v retrieving revision 1.38 diff -u -p -r1.38 mimemrel.cpp --- mime/src/mimemrel.cpp 18 May 2004 08:18:55 -0000 1.38 +++ mime/src/mimemrel.cpp 14 Sep 2006 10:51:56 -0000 @@ -617,7 +617,7 @@ MimeMultipartRelated_output_child_p(Mime static int MimeMultipartRelated_parse_child_line (MimeObject *obj, - char *line, PRInt32 length, + const char *line, PRInt32 length, PRBool first_line_p) { MimeContainer *cont = (MimeContainer *) obj; Index: mime/src/mimemsg.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimemsg.cpp,v retrieving revision 1.55 diff -u -p -r1.55 mimemsg.cpp --- mime/src/mimemsg.cpp 10 Jun 2004 15:58:10 -0000 1.55 +++ mime/src/mimemsg.cpp 14 Sep 2006 10:51:56 -0000 @@ -63,7 +63,7 @@ static int MimeMessage_initialize (MimeO static void MimeMessage_finalize (MimeObject *); static int MimeMessage_add_child (MimeObject *, MimeObject *); static int MimeMessage_parse_begin (MimeObject *); -static int MimeMessage_parse_line (char *, PRInt32, MimeObject *); +static int MimeMessage_parse_line (const char *, PRInt32, MimeObject *); static int MimeMessage_parse_eof (MimeObject *, PRBool); static int MimeMessage_close_headers (MimeObject *obj); static int MimeMessage_write_headers_html (MimeObject *); @@ -146,9 +146,9 @@ MimeMessage_parse_begin (MimeObject *obj static int -MimeMessage_parse_line (char *aLine, PRInt32 aLength, MimeObject *obj) +MimeMessage_parse_line (const char *aLine, PRInt32 aLength, MimeObject *obj) { - char * line = aLine; + const char * line = aLine; PRInt32 length = aLength; MimeMessage *msg = (MimeMessage *) obj; @@ -508,7 +508,7 @@ MimeMessage_close_headers (MimeObject *o char *msgID = MimeHeaders_get (msg->hdrs, HEADER_MESSAGE_ID, PR_FALSE, PR_FALSE); - char *outCharset = NULL; + const char *outCharset = NULL; if (!obj->options->force_user_charset) /* Only convert if the user prefs is false */ outCharset = "UTF-8"; Index: mime/src/mimemsig.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimemsig.cpp,v retrieving revision 1.21 diff -u -p -r1.21 mimemsig.cpp --- mime/src/mimemsig.cpp 25 Jan 2006 22:48:07 -0000 1.21 +++ mime/src/mimemsig.cpp 14 Sep 2006 10:51:57 -0000 @@ -55,8 +55,8 @@ MimeDefClass(MimeMultipartSigned, MimeMu static int MimeMultipartSigned_initialize (MimeObject *); static int MimeMultipartSigned_create_child (MimeObject *); static int MimeMultipartSigned_close_child(MimeObject *); -static int MimeMultipartSigned_parse_line (char *, PRInt32, MimeObject *); -static int MimeMultipartSigned_parse_child_line (MimeObject *, char *, PRInt32, +static int MimeMultipartSigned_parse_line (const char *, PRInt32, MimeObject *); +static int MimeMultipartSigned_parse_child_line (MimeObject *, const char *, PRInt32, PRBool); static int MimeMultipartSigned_parse_eof (MimeObject *, PRBool); static void MimeMultipartSigned_finalize (MimeObject *); @@ -176,7 +176,7 @@ MimeMultipartSigned_finalize (MimeObject static int -MimeMultipartSigned_parse_line (char *line, PRInt32 length, MimeObject *obj) +MimeMultipartSigned_parse_line (const char *line, PRInt32 length, MimeObject *obj) { MimeMultipart *mult = (MimeMultipart *) obj; MimeMultipartSigned *sig = (MimeMultipartSigned *) obj; @@ -506,7 +506,7 @@ MimeMultipartSigned_close_child (MimeObj static int MimeMultipartSigned_parse_child_line (MimeObject *obj, - char *line, PRInt32 length, + const char *line, PRInt32 length, PRBool first_line_p) { MimeMultipartSigned *sig = (MimeMultipartSigned *) obj; Index: mime/src/mimemsig.h =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimemsig.h,v retrieving revision 1.6 diff -u -p -r1.6 mimemsig.h --- mime/src/mimemsig.h 17 Apr 2004 18:33:13 -0000 1.6 +++ mime/src/mimemsig.h 14 Sep 2006 10:51:57 -0000 @@ -54,7 +54,7 @@ used to initialize the dexlateion engine. NULL indicates failure; otherwise, an opaque closure object should be returned. - int crypto_data_hash (char *data, PRInt32 data_size, + int crypto_data_hash (const char *data, PRInt32 data_size, void *crypto_closure) This is called with the raw data, for which a signature has been computed. @@ -75,7 +75,7 @@ initialization here, or may wish to examine the actual headers of the signature object itself. - int crypto_signature_hash (char *data, PRInt32 data_size, + int crypto_signature_hash (const char *data, PRInt32 data_size, void *crypto_closure) This is called with the raw data of the detached signature block. It will @@ -123,9 +123,9 @@ struct MimeMultipartSignedClass { /* Callbacks used by dexlateion (really, signature verification) module. */ void * (*crypto_init) (MimeObject *multipart_object); - int (*crypto_data_hash) (char *data, PRInt32 data_size, + int (*crypto_data_hash) (const char *data, PRInt32 data_size, void *crypto_closure); - int (*crypto_signature_hash) (char *data, PRInt32 data_size, + int (*crypto_signature_hash) (const char *data, PRInt32 data_size, void *crypto_closure); int (*crypto_data_eof) (void *crypto_closure, PRBool abort_p); Index: mime/src/mimemult.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimemult.cpp,v retrieving revision 1.47 diff -u -p -r1.47 mimemult.cpp --- mime/src/mimemult.cpp 14 Sep 2005 16:10:20 -0000 1.47 +++ mime/src/mimemult.cpp 14 Sep 2006 10:51:57 -0000 @@ -57,7 +57,7 @@ MimeDefClass(MimeMultipart, MimeMultipar static int MimeMultipart_initialize (MimeObject *); static void MimeMultipart_finalize (MimeObject *); -static int MimeMultipart_parse_line (char *line, PRInt32 length, MimeObject *); +static int MimeMultipart_parse_line (const char *line, PRInt32 length, MimeObject *); static int MimeMultipart_parse_eof (MimeObject *object, PRBool abort_p); static MimeMultipartBoundaryType MimeMultipart_check_boundary(MimeObject *, @@ -65,7 +65,7 @@ static MimeMultipartBoundaryType MimeMul PRInt32); static int MimeMultipart_create_child(MimeObject *); static PRBool MimeMultipart_output_child_p(MimeObject *, MimeObject *); -static int MimeMultipart_parse_child_line (MimeObject *, char *, PRInt32, +static int MimeMultipart_parse_child_line (MimeObject *, const char *, PRInt32, PRBool); static int MimeMultipart_close_child(MimeObject *); @@ -145,7 +145,7 @@ int MimeWriteAString(MimeObject *obj, co } static int -MimeMultipart_parse_line (char *line, PRInt32 length, MimeObject *obj) +MimeMultipart_parse_line (const char *line, PRInt32 length, MimeObject *obj) { MimeMultipart *mult = (MimeMultipart *) obj; int status = 0; @@ -632,7 +632,7 @@ MimeMultipart_close_child(MimeObject *ob static int -MimeMultipart_parse_child_line (MimeObject *obj, char *line, PRInt32 length, +MimeMultipart_parse_child_line (MimeObject *obj, const char *line, PRInt32 length, PRBool first_line_p) { MimeContainer *cont = (MimeContainer *) obj; Index: mime/src/mimemult.h =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimemult.h,v retrieving revision 1.5 diff -u -p -r1.5 mimemult.h --- mime/src/mimemult.h 17 Apr 2004 18:33:13 -0000 1.5 +++ mime/src/mimemult.h 14 Sep 2006 10:51:58 -0000 @@ -56,7 +56,7 @@ Whether this child should be output. Default method always says `yes'. - int parse_child_line (MimeObject *obj, char *line, PRInt32 length, + int parse_child_line (MimeObject *obj, const char *line, PRInt32 length, PRBool first_line_p) When we have a line which should be handed off to the currently-active @@ -111,7 +111,7 @@ struct MimeMultipartClass { int (*create_child) (MimeObject *); PRBool (*output_child_p) (MimeObject *self, MimeObject *child); int (*close_child) (MimeObject *); - int (*parse_child_line) (MimeObject *, char *line, PRInt32 length, + int (*parse_child_line) (MimeObject *, const char *line, PRInt32 length, PRBool first_line_p); MimeMultipartBoundaryType (*check_boundary) (MimeObject *, const char *line, PRInt32 length); Index: mime/src/mimeobj.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimeobj.cpp,v retrieving revision 1.28 diff -u -p -r1.28 mimeobj.cpp --- mime/src/mimeobj.cpp 3 Jun 2005 10:26:24 -0000 1.28 +++ mime/src/mimeobj.cpp 14 Sep 2006 10:51:58 -0000 @@ -66,7 +66,7 @@ static int MimeObject_initialize (MimeOb static void MimeObject_finalize (MimeObject *); static int MimeObject_parse_begin (MimeObject *); static int MimeObject_parse_buffer (const char *, PRInt32, MimeObject *); -static int MimeObject_parse_line (char *, PRInt32, MimeObject *); +static int MimeObject_parse_line (const char *, PRInt32, MimeObject *); static int MimeObject_parse_eof (MimeObject *, PRBool); static int MimeObject_parse_end (MimeObject *, PRBool); static PRBool MimeObject_displayable_inline_p (MimeObjectClass *clazz, @@ -286,7 +286,7 @@ MimeObject_parse_buffer (const char *buf static int -MimeObject_parse_line (char *line, PRInt32 length, MimeObject *obj) +MimeObject_parse_line (const char *line, PRInt32 length, MimeObject *obj) { /* This method should never be called. */ NS_ASSERTION(0, "shouldn't call this method"); Index: mime/src/mimeobj.h =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimeobj.h,v retrieving revision 1.10 diff -u -p -r1.10 mimeobj.h --- mime/src/mimeobj.h 17 Apr 2004 18:33:13 -0000 1.10 +++ mime/src/mimeobj.h 14 Sep 2006 10:51:58 -0000 @@ -72,7 +72,7 @@ Called after `init' but before `parse_line' or `parse_buffer'. Can be used to initialize various parsing machinery. - int parse_line (char *line, PRInt32 length, MimeObject *obj) + int parse_line (const char *line, PRInt32 length, MimeObject *obj) This method is called (by parse_buffer()) for each complete line of data handed to the parser, and is the method which most subclasses @@ -145,7 +145,7 @@ struct MimeObjectClass { void (*finalize) (MimeObject *obj); int (*parse_begin) (MimeObject *obj); int (*parse_buffer) (const char *buf, PRInt32 size, MimeObject *obj); - int (*parse_line) (char *line, PRInt32 length, MimeObject *obj); + int (*parse_line) (const char *line, PRInt32 length, MimeObject *obj); int (*parse_eof) (MimeObject *obj, PRBool abort_p); int (*parse_end) (MimeObject *obj, PRBool abort_p); Index: mime/src/mimesun.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimesun.cpp,v retrieving revision 1.11 diff -u -p -r1.11 mimesun.cpp --- mime/src/mimesun.cpp 17 Apr 2004 18:33:13 -0000 1.11 +++ mime/src/mimesun.cpp 14 Sep 2006 10:51:58 -0000 @@ -51,7 +51,7 @@ static MimeMultipartBoundaryType MimeSun const char *, PRInt32); static int MimeSunAttachment_create_child(MimeObject *); -static int MimeSunAttachment_parse_child_line (MimeObject *, char *, PRInt32, +static int MimeSunAttachment_parse_child_line (MimeObject *, const char *, PRInt32, PRBool); static int MimeSunAttachment_parse_begin (MimeObject *); static int MimeSunAttachment_parse_eof (MimeObject *, PRBool); @@ -351,7 +351,7 @@ MimeSunAttachment_create_child(MimeObjec static int -MimeSunAttachment_parse_child_line (MimeObject *obj, char *line, PRInt32 length, +MimeSunAttachment_parse_child_line (MimeObject *obj, const char *line, PRInt32 length, PRBool first_line_p) { MimeContainer *cont = (MimeContainer *) obj; Index: mime/src/mimethpl.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimethpl.cpp,v retrieving revision 1.6 diff -u -p -r1.6 mimethpl.cpp --- mime/src/mimethpl.cpp 3 Feb 2006 14:18:22 -0000 1.6 +++ mime/src/mimethpl.cpp 14 Sep 2006 10:51:59 -0000 @@ -60,7 +60,7 @@ MimeDefClass(MimeInlineTextHTMLAsPlaintext, MimeInlineTextHTMLAsPlaintextClass, mimeInlineTextHTMLAsPlaintextClass, &MIME_SUPERCLASS); -static int MimeInlineTextHTMLAsPlaintext_parse_line (char *, PRInt32, +static int MimeInlineTextHTMLAsPlaintext_parse_line (const char *, PRInt32, MimeObject *); static int MimeInlineTextHTMLAsPlaintext_parse_begin (MimeObject *obj); static int MimeInlineTextHTMLAsPlaintext_parse_eof (MimeObject *, PRBool); @@ -162,7 +162,7 @@ MimeInlineTextHTMLAsPlaintext_finalize ( } static int -MimeInlineTextHTMLAsPlaintext_parse_line (char *line, PRInt32 length, +MimeInlineTextHTMLAsPlaintext_parse_line (const char *line, PRInt32 length, MimeObject *obj) { MimeInlineTextHTMLAsPlaintext *textHTMLPlain = Index: mime/src/mimethsa.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimethsa.cpp,v retrieving revision 1.8 diff -u -p -r1.8 mimethsa.cpp --- mime/src/mimethsa.cpp 3 Feb 2006 14:18:22 -0000 1.8 +++ mime/src/mimethsa.cpp 14 Sep 2006 10:51:59 -0000 @@ -54,7 +54,7 @@ MimeDefClass(MimeInlineTextHTMLSanitized, MimeInlineTextHTMLSanitizedClass, mimeInlineTextHTMLSanitizedClass, &MIME_SUPERCLASS); -static int MimeInlineTextHTMLSanitized_parse_line (char *, PRInt32, +static int MimeInlineTextHTMLSanitized_parse_line (const char *, PRInt32, MimeObject *); static int MimeInlineTextHTMLSanitized_parse_begin (MimeObject *obj); static int MimeInlineTextHTMLSanitized_parse_eof (MimeObject *, PRBool); @@ -250,7 +250,7 @@ printf("/finalize\n"); } static int -MimeInlineTextHTMLSanitized_parse_line (char *line, PRInt32 length, +MimeInlineTextHTMLSanitized_parse_line (const char *line, PRInt32 length, MimeObject *obj) { #ifdef DEBUG_BenB Index: mime/src/mimethtm.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimethtm.cpp,v retrieving revision 1.31 diff -u -p -r1.31 mimethtm.cpp --- mime/src/mimethtm.cpp 17 Apr 2004 18:33:13 -0000 1.31 +++ mime/src/mimethtm.cpp 14 Sep 2006 10:51:59 -0000 @@ -47,7 +47,7 @@ MimeDefClass(MimeInlineTextHTML, MimeInlineTextHTMLClass, mimeInlineTextHTMLClass, &MIME_SUPERCLASS); -static int MimeInlineTextHTML_parse_line (char *, PRInt32, MimeObject *); +static int MimeInlineTextHTML_parse_line (const char *, PRInt32, MimeObject *); static int MimeInlineTextHTML_parse_eof (MimeObject *, PRBool); static int MimeInlineTextHTML_parse_begin (MimeObject *obj); @@ -160,7 +160,7 @@ MimeInlineTextHTML_parse_begin (MimeObje static int -MimeInlineTextHTML_parse_line (char *line, PRInt32 length, MimeObject *obj) +MimeInlineTextHTML_parse_line (const char *line, PRInt32 length, MimeObject *obj) { MimeInlineTextHTML *textHTML = (MimeInlineTextHTML *) obj; Index: mime/src/mimetpfl.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimetpfl.cpp,v retrieving revision 1.56 diff -u -p -r1.56 mimetpfl.cpp --- mime/src/mimetpfl.cpp 25 Apr 2006 21:18:52 -0000 1.56 +++ mime/src/mimetpfl.cpp 14 Sep 2006 10:52:00 -0000 @@ -58,7 +58,7 @@ MimeDefClass(MimeInlineTextPlainFlowed, mimeInlineTextPlainFlowedClass, &MIME_SUPERCLASS); static int MimeInlineTextPlainFlowed_parse_begin (MimeObject *); -static int MimeInlineTextPlainFlowed_parse_line (char *, PRInt32, MimeObject *); +static int MimeInlineTextPlainFlowed_parse_line (const char *, PRInt32, MimeObject *); static int MimeInlineTextPlainFlowed_parse_eof (MimeObject *, PRBool); static MimeInlineTextPlainFlowedExData *MimeInlineTextPlainFlowedExDataList = nsnull; @@ -286,7 +286,7 @@ EarlyOut: static int -MimeInlineTextPlainFlowed_parse_line (char *line, PRInt32 length, MimeObject *obj) +MimeInlineTextPlainFlowed_parse_line (const char *aLine, PRInt32 length, MimeObject *obj) { int status; PRBool quoting = ( obj->options @@ -309,7 +309,9 @@ MimeInlineTextPlainFlowed_parse_line (ch if (length <= 0) return 0; uint32 linequotelevel = 0; - const char *linep = line; + nsCAutoString real_line(aLine, length); + char *line = real_line.BeginWriting(); + const char *linep = real_line.BeginReading(); // Space stuffed? if(' ' == *linep) { linep++; Index: mime/src/mimetpla.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimetpla.cpp,v retrieving revision 1.60 diff -u -p -r1.60 mimetpla.cpp --- mime/src/mimetpla.cpp 9 Feb 2005 01:40:24 -0000 1.60 +++ mime/src/mimetpla.cpp 14 Sep 2006 10:52:00 -0000 @@ -58,7 +58,7 @@ MimeDefClass(MimeInlineTextPlain, MimeIn mimeInlineTextPlainClass, &MIME_SUPERCLASS); static int MimeInlineTextPlain_parse_begin (MimeObject *); -static int MimeInlineTextPlain_parse_line (char *, PRInt32, MimeObject *); +static int MimeInlineTextPlain_parse_line (const char *, PRInt32, MimeObject *); static int MimeInlineTextPlain_parse_eof (MimeObject *, PRBool); static int @@ -304,7 +304,7 @@ MimeInlineTextPlain_parse_eof (MimeObjec static int -MimeInlineTextPlain_parse_line (char *line, PRInt32 length, MimeObject *obj) +MimeInlineTextPlain_parse_line (const char *line, PRInt32 length, MimeObject *obj) { int status; PRBool quoting = ( obj->options Index: mime/src/mimetric.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimetric.cpp,v retrieving revision 1.15 diff -u -p -r1.15 mimetric.cpp --- mime/src/mimetric.cpp 17 Apr 2004 18:33:13 -0000 1.15 +++ mime/src/mimetric.cpp 14 Sep 2006 10:52:02 -0000 @@ -46,7 +46,7 @@ MimeDefClass(MimeInlineTextRichtext, MimeInlineTextRichtextClass, mimeInlineTextRichtextClass, &MIME_SUPERCLASS); -static int MimeInlineTextRichtext_parse_line (char *, PRInt32, MimeObject *); +static int MimeInlineTextRichtext_parse_line (const char *, PRInt32, MimeObject *); static int MimeInlineTextRichtext_parse_begin (MimeObject *); static int MimeInlineTextRichtext_parse_eof (MimeObject *, PRBool); @@ -65,7 +65,7 @@ MimeInlineTextRichtextClassInitialize(Mi from outside this module (no MimeObject, etc.) */ int -MimeRichtextConvert (char *line, PRInt32 length, +MimeRichtextConvert (const char *line, PRInt32 length, int (*output_fn) (const char *buf, PRInt32 size, void *closure), void *closure, char **obufferP, @@ -181,8 +181,8 @@ MimeRichtextConvert (char *line, PRInt32 { /* Push out this ID. */ const char *old = this_start + 1; - char *tag_open = 0; - char *tag_close = 0; + const char *tag_open = 0; + const char *tag_close = 0; if (*old == '/') { /* This is */ @@ -330,7 +330,7 @@ MimeRichtextConvert (char *line, PRInt32 static int -MimeInlineTextRichtext_parse_line (char *line, PRInt32 length, MimeObject *obj) +MimeInlineTextRichtext_parse_line (const char *line, PRInt32 length, MimeObject *obj) { PRBool enriched_p = (((MimeInlineTextRichtextClass *) obj->clazz) ->enriched_p); Index: mime/src/mimeunty.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/mimeunty.cpp,v retrieving revision 1.15 diff -u -p -r1.15 mimeunty.cpp --- mime/src/mimeunty.cpp 17 Apr 2004 18:33:13 -0000 1.15 +++ mime/src/mimeunty.cpp 14 Sep 2006 10:52:02 -0000 @@ -51,7 +51,7 @@ MimeDefClass(MimeUntypedText, MimeUntype static int MimeUntypedText_initialize (MimeObject *); static void MimeUntypedText_finalize (MimeObject *); static int MimeUntypedText_parse_begin (MimeObject *); -static int MimeUntypedText_parse_line (char *, PRInt32, MimeObject *); +static int MimeUntypedText_parse_line (const char *, PRInt32, MimeObject *); static int MimeUntypedText_open_subpart (MimeObject *obj, MimeUntypedTextSubpartType ttype, @@ -124,7 +124,7 @@ MimeUntypedText_parse_begin (MimeObject } static int -MimeUntypedText_parse_line (char *line, PRInt32 length, MimeObject *obj) +MimeUntypedText_parse_line (const char *line, PRInt32 length, MimeObject *obj) { MimeUntypedText *uty = (MimeUntypedText *) obj; int status = 0; Index: mime/src/nsSimpleMimeConverterStub.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/mime/src/nsSimpleMimeConverterStub.cpp,v retrieving revision 1.2 diff -u -p -r1.2 nsSimpleMimeConverterStub.cpp --- mime/src/nsSimpleMimeConverterStub.cpp 30 Mar 2006 18:40:53 -0000 1.2 +++ mime/src/nsSimpleMimeConverterStub.cpp 14 Sep 2006 10:52:03 -0000 @@ -82,7 +82,7 @@ BeginGather(MimeObject *obj) } static int -GatherLine(char *line, PRInt32 length, MimeObject *obj) +GatherLine(const char *line, PRInt32 length, MimeObject *obj) { MimeSimpleStub *ssobj = (MimeSimpleStub *)obj;