Warning fixes. r=Pike, rs=jst.

content/xslt/src/xslt/txOutputFormat.cpp

@@ -109,10 +109,12 @@ void txOutputFormat::merge(txOutputFormat& aOutputFormat)
 
 void txOutputFormat::setFromDefaults()
 {
-    if (mMethod == eMethodNotSet)
-        mMethod = eXMLOutput;
-
     switch (mMethod) {
+        case eMethodNotSet:
+        {
+            mMethod = eXMLOutput;
+            // Fall through
+        }
         case eXMLOutput:
         {
             if (mVersion.isEmpty())

content/xslt/src/xslt/txPatternParser.cpp

@@ -233,7 +233,6 @@ nsresult txPatternParser::createLocPathPattern(ExprLexer& aLexer,
 nsresult txPatternParser::createIdPattern(ExprLexer& aLexer,
                                           txPattern*& aPattern)
 {
-    nsresult rv = NS_OK;
     // check for '(' Literal ')'
     if (aLexer.nextToken()->type != Token::L_PAREN && 
         aLexer.peek()->type != Token::LITERAL)