diff --git a/mailnews/mime/cthandlers/glue/mimexpcom.cpp b/mailnews/mime/cthandlers/glue/mimexpcom.cpp index 7be0bddaef0e..f60ad6dfeb06 100644 --- a/mailnews/mime/cthandlers/glue/mimexpcom.cpp +++ b/mailnews/mime/cthandlers/glue/mimexpcom.cpp @@ -119,8 +119,7 @@ COM_MimeObject_write(void *mimeObject, char *data, PRInt32 length, PRBool user_visible_p) { nsCOMPtr objAccess; - void *ptr = NULL; - PRInt32 rc; + PRInt32 rc=-1; nsresult res = nsComponentManager::CreateInstance(kMimeObjectClassAccessCID, NULL, nsIMimeObjectClassAccess::GetIID(), diff --git a/mailnews/mime/cthandlers/vcard/comi18n.cpp b/mailnews/mime/cthandlers/vcard/comi18n.cpp index a2d86f792f5e..97584e49e79f 100644 --- a/mailnews/mime/cthandlers/vcard/comi18n.cpp +++ b/mailnews/mime/cthandlers/vcard/comi18n.cpp @@ -322,12 +322,15 @@ static char * intlmime_encode_qp_buf(char *subject); static PRBool intlmime_is_mime_part2_header(const char *header); +#if 0 static char * intl_decode_mime_part2_str(const char *, int , char* ); +#endif - +#if 0 /* We probably should change these into private instead of PUBLIC */ static char *DecodeBase64Buffer(char *subject); static char *EncodeBase64Buffer(char *subject, size_t size); +#endif static PRInt32 INTL_ConvertCharset(const char* from_charset, const char* to_charset, const char* inBuffer, const PRInt32 inLength, @@ -348,6 +351,7 @@ static PRBool NeedCharsetConversion(const char* from_charset, const char* to_cha return PR_TRUE; } +#if 0 /* 4.0: Made Encode & Decode public for use by libpref; added size param. */ static char *EncodeBase64Buffer(char *subject, size_t size) @@ -365,6 +369,7 @@ static char *DecodeBase64Buffer(char *subject) /* We should use the new Base64 Decoder wrote by jwz in libmime */ return intlmime_decode_base64_buf(subject); } +#endif static char basis_64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; diff --git a/mailnews/mime/cthandlers/vcard/mimexpcom.cpp b/mailnews/mime/cthandlers/vcard/mimexpcom.cpp index 7be0bddaef0e..f60ad6dfeb06 100644 --- a/mailnews/mime/cthandlers/vcard/mimexpcom.cpp +++ b/mailnews/mime/cthandlers/vcard/mimexpcom.cpp @@ -119,8 +119,7 @@ COM_MimeObject_write(void *mimeObject, char *data, PRInt32 length, PRBool user_visible_p) { nsCOMPtr objAccess; - void *ptr = NULL; - PRInt32 rc; + PRInt32 rc=-1; nsresult res = nsComponentManager::CreateInstance(kMimeObjectClassAccessCID, NULL, nsIMimeObjectClassAccess::GetIID(), diff --git a/mailnews/mime/cthandlers/vcard/nsVCard.cpp b/mailnews/mime/cthandlers/vcard/nsVCard.cpp index c5fceb81aae9..71666d793248 100644 --- a/mailnews/mime/cthandlers/vcard/nsVCard.cpp +++ b/mailnews/mime/cthandlers/vcard/nsVCard.cpp @@ -485,7 +485,7 @@ static void enterProps(const char *s) static void enterAttr(const char *s1, const char *s2) { - const char *p1, *p2; + const char *p1, *p2=nsnull; p1 = lookupProp_(s1); if (s2) { VObject *a; @@ -805,7 +805,7 @@ static char* lexGet1Value() { } #endif - +#if 0 static char* lexGetStrUntil(char *termset) { int c = lexLookahead(); lexClearToken(); @@ -817,6 +817,7 @@ static char* lexGetStrUntil(char *termset) { lexAppendc(0); return c==EOF?0:lexStr(); } +#endif static int match_begin_name(int end) { char *n = lexLookaheadWord(); @@ -1293,7 +1294,7 @@ yyparse() *yyssp = yystate = 0; yyloop: - if (yyn = yydefred[yystate]) goto yyreduce; + if ((yyn = yydefred[yystate])) goto yyreduce; if (yychar < 0) { if ((yychar = yylex()) < 0) yychar = 0; diff --git a/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp b/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp index b0f032762579..95319eda4e55 100644 --- a/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp +++ b/mailnews/mime/cthandlers/vcard/nsVCardObj.cpp @@ -76,9 +76,10 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. static const char** fieldedProp; static VObject* newVObject_(const char *id); +#if 0 static int vObjectValueType(VObject *o); static void initVObjectIterator(VObjectIterator *i, VObject *o); - +#endif /*---------------------------------------------------------------------- The following functions involve with memory allocation: newVObject @@ -261,11 +262,12 @@ void setVObjectVObjectValue(VObject *o, VObject *p) VALUE_TYPE(o) = VCVT_VOBJECT; } +#if 0 int vObjectValueType(VObject *o) { return VALUE_TYPE(o); } - +#endif /*---------------------------------------------------------------------- The following functions can be used to build VObject. @@ -360,11 +362,13 @@ void initPropIterator(VObjectIterator *i, VObject *o) i->next = 0; } +#if 0 void initVObjectIterator(VObjectIterator *i, VObject *o) { i->start = o->next; i->next = 0; } +#endif int moreIteration(VObjectIterator *i) { @@ -1384,7 +1388,6 @@ static int inList(const char **list, const char *s) static void writeProp(OFile *fp, VObject *o) { int length = -1; - int ilen = 0; if (NAME_OF(o)) { struct PreDefProp *pi; @@ -1440,7 +1443,6 @@ static void writeProp(OFile *fp, VObject *o) void writeVObject_(OFile *fp, VObject *o) { - int ilen = 0; if (NAME_OF(o)) { struct PreDefProp *pi; pi = lookupPropInfo(NAME_OF(o));