Fix for bug 132163 (patch v2). Fix warnings. R=ducarroz, SR=bienvenu. Patch provided by ayn2@cornell.edu (Aleksey Nogin)

mailnews/mime/cthandlers/vcard/nsVCard.cpp

@@ -498,24 +498,24 @@ static void enterProps(const char *s)
     }
 
 static void enterAttr(const char *s1, const char *s2)
-    {
-    const char *p1, *p2;
-    p1 = lookupProp_(s1);
-    if (s2) {
-	VObject *a;
-	p2 = lookupProp_(s2);
-	a = addProp(curProp,p1);
-	setVObjectStringZValue(a,p2);
+{
+  const char *p1, *p2 = nsnull;
+  p1 = lookupProp_(s1);
+  if (s2) {
+	  VObject *a;
+	  p2 = lookupProp_(s2);
+	  a = addProp(curProp,p1);
+	  setVObjectStringZValue(a,p2);
 	}
-    else
-	addProp(curProp,p1);
-    if (PL_strcasecmp(p1,VCBase64Prop) == 0 || (s2 && PL_strcasecmp(p2,VCBase64Prop)==0))
-	lexPushMode(L_BASE64);
-    else if (PL_strcasecmp(p1,VCQuotedPrintableProp) == 0
+  else
+	  addProp(curProp,p1);
+  if (PL_strcasecmp(p1,VCBase64Prop) == 0 || (s2 && PL_strcasecmp(p2,VCBase64Prop)==0))
+	  lexPushMode(L_BASE64);
+  else if (PL_strcasecmp(p1,VCQuotedPrintableProp) == 0
 	    || (s2 && PL_strcasecmp(p2,VCQuotedPrintableProp)==0))
-	lexPushMode(L_QUOTED_PRINTABLE);
-    deleteString((char *)s1); deleteString((char *)s2);
-    }
+    lexPushMode(L_QUOTED_PRINTABLE);
+  deleteString((char *)s1); deleteString((char *)s2);
+}
 
 
 #define PR_MAX_LEX_LOOKAHEAD_0 32
@@ -1306,7 +1306,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;

mailnews/mime/src/mimecryp.cpp

@@ -256,8 +256,6 @@ MimeEncrypted_parse_eof (MimeObject *obj, PRBool abort_p)
 static int
 MimeEncrypted_parse_end (MimeObject *obj, PRBool abort_p)
 {
-  MimeEncrypted *enc = (MimeEncrypted *) obj;
-
   return ((MimeObjectClass*)&MIME_SUPERCLASS)->parse_end (obj, abort_p);
 }
 
@@ -458,10 +456,10 @@ MimeEncrypted_emit_buffered_child(MimeObject *obj)
 		  obj->options->generate_post_header_html_fn &&
 		  !obj->options->state->post_header_html_run_p)
 		{
-		  MimeHeaders *outer_headers;
+		  MimeHeaders *outer_headers = nsnull;
 		  MimeObject *p;
 		  for (p = obj; p->parent; p = p->parent)
-			outer_headers = p->headers;
+			  outer_headers = p->headers;
 		  PR_ASSERT(obj->options->state->first_data_written_p);
 		  html = obj->options->generate_post_header_html_fn(NULL,
 													obj->options->html_closure,