diff --git a/mailnews/mime/src/mimecms.cpp b/mailnews/mime/src/mimecms.cpp index d99b5010d74..c7644ffa536 100644 --- a/mailnews/mime/src/mimecms.cpp +++ b/mailnews/mime/src/mimecms.cpp @@ -74,11 +74,12 @@ extern int SEC_ERROR_CERT_ADDR_MISMATCH; static int MimeEncryptedCMSClassInitialize(MimeEncryptedCMSClass *clazz) { +#ifdef DEBUG MimeObjectClass *oclass = (MimeObjectClass *) clazz; - MimeEncryptedClass *eclass = (MimeEncryptedClass *) clazz; - NS_ASSERTION(!oclass->class_initialized, "1.2 01 Nov 2001 17:59"); +#endif + MimeEncryptedClass *eclass = (MimeEncryptedClass *) clazz; eclass->crypto_init = MimeCMS_init; eclass->crypto_write = MimeCMS_write; eclass->crypto_eof = MimeCMS_eof; @@ -260,7 +261,7 @@ MimeCMSHeadersAndCertsMatch(MimeObject *obj, s = MimeHeaders_get(msg_headers, HEADER_FROM, PR_FALSE, PR_FALSE); if (s) { - int n = ParseRFC822Addresses(s, getter_Copies(from_name), getter_Copies(from_addr)); + ParseRFC822Addresses(s, getter_Copies(from_name), getter_Copies(from_addr)); PR_FREEIF(s); } @@ -268,7 +269,7 @@ MimeCMSHeadersAndCertsMatch(MimeObject *obj, s = MimeHeaders_get(msg_headers, HEADER_SENDER, PR_FALSE, PR_FALSE); if (s) { - int n = ParseRFC822Addresses(s, getter_Copies(sender_name), getter_Copies(sender_addr)); + ParseRFC822Addresses(s, getter_Copies(sender_name), getter_Copies(sender_addr)); PR_FREEIF(s); } } diff --git a/mailnews/mime/src/mimemcms.cpp b/mailnews/mime/src/mimemcms.cpp index eb0f7819cf2..f4902914f74 100644 --- a/mailnews/mime/src/mimemcms.cpp +++ b/mailnews/mime/src/mimemcms.cpp @@ -337,7 +337,6 @@ MimeMultCMS_sig_init (void *crypto_closure, MimeHeaders *signature_hdrs) { MimeMultCMSdata *data = (MimeMultCMSdata *) crypto_closure; - MimeDisplayOptions *opts = multipart_object->options; char *ct; int status = 0; nsresult rv; diff --git a/mailnews/mime/src/mimemdig.cpp b/mailnews/mime/src/mimemdig.cpp index 7ef5004e135..8a72307509d 100644 --- a/mailnews/mime/src/mimemdig.cpp +++ b/mailnews/mime/src/mimemdig.cpp @@ -46,9 +46,11 @@ MimeDefClass(MimeMultipartDigest, MimeMultipartDigestClass, static int MimeMultipartDigestClassInitialize(MimeMultipartDigestClass *clazz) { +#ifdef DEBUG MimeObjectClass *oclass = (MimeObjectClass *) clazz; - MimeMultipartClass *mclass = (MimeMultipartClass *) clazz; PR_ASSERT(!oclass->class_initialized); +#endif + MimeMultipartClass *mclass = (MimeMultipartClass *) clazz; mclass->default_part_type = MESSAGE_RFC822; return 0; } diff --git a/mailnews/mime/src/mimemmix.cpp b/mailnews/mime/src/mimemmix.cpp index 30afebe4ee9..9d34407456a 100644 --- a/mailnews/mime/src/mimemmix.cpp +++ b/mailnews/mime/src/mimemmix.cpp @@ -45,7 +45,9 @@ MimeDefClass(MimeMultipartMixed, MimeMultipartMixedClass, static int MimeMultipartMixedClassInitialize(MimeMultipartMixedClass *clazz) { +#ifdef DEBUG MimeObjectClass *oclass = (MimeObjectClass *) clazz; PR_ASSERT(!oclass->class_initialized); +#endif return 0; } diff --git a/mailnews/mime/src/mimemoz2.cpp b/mailnews/mime/src/mimemoz2.cpp index c5f4f4bacab..61974f30f1e 100644 --- a/mailnews/mime/src/mimemoz2.cpp +++ b/mailnews/mime/src/mimemoz2.cpp @@ -526,7 +526,6 @@ MimeGetAttachmentList(MimeObject *tobj, const char *aMessageURL, nsMsgAttachment MimeObject *obj; MimeContainer *cobj; PRInt32 n; - PRBool isAlternativeOrRelated = PR_FALSE; PRBool isAnInlineMessage; if (!data) @@ -707,13 +706,6 @@ SetMailCharacterSetToMsgWindow(MimeObject *obj, const char *aCharacterSet) return rv; } -static char * -mime_reformat_date(const char *date, void *stream_closure) -{ - /* struct mime_stream_data *msd = (struct mime_stream_data *) stream_closure; */ - return nsCRT::strdup(date); -} - static char * mime_file_type (const char *filename, void *stream_closure) { diff --git a/mailnews/mime/src/mimempar.cpp b/mailnews/mime/src/mimempar.cpp index 315b2b7a373..b3c5ace162a 100644 --- a/mailnews/mime/src/mimempar.cpp +++ b/mailnews/mime/src/mimempar.cpp @@ -45,7 +45,9 @@ MimeDefClass(MimeMultipartParallel, MimeMultipartParallelClass, static int MimeMultipartParallelClassInitialize(MimeMultipartParallelClass *clazz) { +#ifdef DEBUG MimeObjectClass *oclass = (MimeObjectClass *) clazz; PR_ASSERT(!oclass->class_initialized); +#endif return 0; } diff --git a/mailnews/mime/src/mimetenr.cpp b/mailnews/mime/src/mimetenr.cpp index c5ed544f5f6..3a5c5577a15 100644 --- a/mailnews/mime/src/mimetenr.cpp +++ b/mailnews/mime/src/mimetenr.cpp @@ -50,9 +50,11 @@ MimeDefClass(MimeInlineTextEnriched, MimeInlineTextEnrichedClass, static int MimeInlineTextEnrichedClassInitialize(MimeInlineTextEnrichedClass *clazz) { +#ifdef DEBUG MimeObjectClass *oclass = (MimeObjectClass *) clazz; - MimeInlineTextRichtextClass *rclass = (MimeInlineTextRichtextClass *) clazz; PR_ASSERT(!oclass->class_initialized); +#endif + MimeInlineTextRichtextClass *rclass = (MimeInlineTextRichtextClass *) clazz; rclass->enriched_p = PR_TRUE; return 0; }