diff --git a/mozilla/htmlparser/src/CParserContext.cpp b/mozilla/htmlparser/src/CParserContext.cpp
index 9a12c2b1db2..eaab4f10d76 100644
--- a/mozilla/htmlparser/src/CParserContext.cpp
+++ b/mozilla/htmlparser/src/CParserContext.cpp
@@ -93,7 +93,6 @@ CParserContext::CParserContext(const CParserContext &aContext) : mMimeType() {
   mStreamListenerState=aContext.mStreamListenerState;
   mMultipart=aContext.mMultipart;
   mContextType=aContext.mContextType;
-  mCopyUnused;
   mChannel=aContext.mChannel;
   mParserCommand=aContext.mParserCommand;
   SetMimeType(aContext.mMimeType);
diff --git a/mozilla/htmlparser/src/nsDTDUtils.cpp b/mozilla/htmlparser/src/nsDTDUtils.cpp
index 0b351f228ff..bbb5b6a2f1b 100644
--- a/mozilla/htmlparser/src/nsDTDUtils.cpp
+++ b/mozilla/htmlparser/src/nsDTDUtils.cpp
@@ -1039,7 +1039,6 @@ CObserverService::~CObserverService() {
 }
 
 nsObserverTopic* CObserverService::GetTopic(const nsString& aTopic) {
-  PRInt32 theSize=mTopics.GetSize();
   PRInt32 theIndex=0;
   nsObserverTopic *theTopic=(nsObserverTopic*)mTopics.ObjectAt(theIndex++);
 
diff --git a/mozilla/htmlparser/src/nsElementTable.cpp b/mozilla/htmlparser/src/nsElementTable.cpp
index 71f2f93e702..7a3d79aacb2 100644
--- a/mozilla/htmlparser/src/nsElementTable.cpp
+++ b/mozilla/htmlparser/src/nsElementTable.cpp
@@ -170,7 +170,7 @@ void Initialize(eHTMLTags aTag,
                 int       aInclusionBits, 
                 int       aExclusionBits,     
                 int       aSpecialProperties,
-                int       aPropagateRange,
+                PRUint32  aPropagateRange,
                 TagList*  aSpecialParents,    
                 TagList*  aSpecialKids,    
                 eHTMLTags aSkipTarget
diff --git a/mozilla/htmlparser/src/nsElementTable.h b/mozilla/htmlparser/src/nsElementTable.h
index 25b010466c5..b659f212971 100644
--- a/mozilla/htmlparser/src/nsElementTable.h
+++ b/mozilla/htmlparser/src/nsElementTable.h
@@ -200,7 +200,7 @@ struct nsHTMLElement {
   int             mInclusionBits;     //defines parental and containment rules
   int             mExclusionBits;     //defines things you CANNOT contain
   int             mSpecialProperties; //used for various special purposes...
-  int             mPropagateRange;    //tells us how far a parent is willing to prop. badly formed children
+  PRUint32        mPropagateRange;    //tells us how far a parent is willing to prop. badly formed children
   TagList*        mSpecialParents;    //These are the special tags that contain this tag (directly)
   TagList*        mSpecialKids;       //These are the extra things you can contain
   eHTMLTags       mSkipTarget;        //If set, then we skip all content until this tag is seen
diff --git a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp
index 19553e4a15b..df50571a7bc 100644
--- a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp
+++ b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp
@@ -1010,7 +1010,9 @@ PRBool nsHTMLContentSinkStream::HasLongLines(const nsString& text)
 {
   const PRInt32 longLineLen = 128;
   nsString str = text;
-  for (PRInt32 start = 0; start < text.Length(); )
+  PRUint32 start=0;
+  PRUint32 theLen=text.Length();
+  for (start = 0; start < theLen; )
   {
     PRInt32 eol = text.FindChar('\n', PR_FALSE, start);
     if (eol < 0) eol = text.Length();
diff --git a/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp b/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp
index e6af5b9817f..6824fd74110 100644
--- a/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp
+++ b/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp
@@ -401,14 +401,6 @@ PRBool nsHTMLToTXTSinkStream::DoOutput()
   return mDoFragment || inBody;
 }
 
-nsAutoString
-Spaces(PRInt32 count)
-{
-  nsAutoString result;
-  while (result.Length() < count)
-    result += ' ';
-  return result;
-}
     
 /**
   * This method is used to a general container. 
@@ -818,7 +810,7 @@ nsHTMLToTXTSinkStream::AddLeaf(const nsIParserNode& aNode)
 
     // Make a line of dashes as wide as the wrap width
     nsAutoString line;
-    int width = (mWrapColumn > 0 ? mWrapColumn : 25);
+    PRUint32 width = (mWrapColumn > 0 ? mWrapColumn : 25);
     while (line.Length() < width)
       line += '-';
     Write(line);
diff --git a/mozilla/htmlparser/src/nsIParser.h b/mozilla/htmlparser/src/nsIParser.h
index 4ae678bcecb..59f45ffab51 100644
--- a/mozilla/htmlparser/src/nsIParser.h
+++ b/mozilla/htmlparser/src/nsIParser.h
@@ -56,7 +56,7 @@ class nsIURI;
 enum eParserCommands {
   eViewNormal,
   eViewSource,
-  eViewErrors,
+  eViewErrors
 };
 
 enum eCRCQuality {
diff --git a/mozilla/htmlparser/src/nsScanner.cpp b/mozilla/htmlparser/src/nsScanner.cpp
index b64bfc859d9..34ac6a43252 100644
--- a/mozilla/htmlparser/src/nsScanner.cpp
+++ b/mozilla/htmlparser/src/nsScanner.cpp
@@ -257,7 +257,7 @@ PRBool nsScanner::Insert(const nsString& aBuffer) {
  */
 PRBool nsScanner::Append(const nsString& aBuffer) {
 
-  PRInt32 theLen=mBuffer.Length();
+  PRUint32 theLen=mBuffer.Length();
 
   mBuffer.Append(aBuffer);
   mTotalRead+=aBuffer.Length();
@@ -279,7 +279,7 @@ PRBool nsScanner::Append(const nsString& aBuffer) {
  */
 PRBool nsScanner::Append(const char* aBuffer, PRUint32 aLen){
 
-  PRInt32 theLen=mBuffer.Length();
+  PRUint32 theLen=mBuffer.Length();
   
   if(mUnicodeDecoder) {
     PRInt32 unicharBufLen = 0;
@@ -345,7 +345,7 @@ PRBool nsScanner::Append(const PRUnichar* aBuffer, PRUint32 aLen){
   CBufDescriptor theDesc(aBuffer,PR_TRUE, aLen+1,aLen);
   nsAutoString theBuffer(theDesc);  
 
-  PRInt32 theLen=mBuffer.Length();  
+  PRUint32 theLen=mBuffer.Length();  
   mBuffer.Append(theBuffer);
   mTotalRead+=aLen;
 
diff --git a/mozilla/htmlparser/src/nsToken.cpp b/mozilla/htmlparser/src/nsToken.cpp
index 4092e4bd01c..c4667a7630b 100644
--- a/mozilla/htmlparser/src/nsToken.cpp
+++ b/mozilla/htmlparser/src/nsToken.cpp
@@ -137,8 +137,9 @@ nsresult CToken::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode) {
  */
 void CToken::DebugDumpToken(nsOutputStream& anOutputStream) {
   anOutputStream << "[" << GetClassName() << "] ";
-  int i=0;
-  for(i=0;i<mTextValue.Length();i++){
+  PRUint32 i=0;
+  PRUint32 theLen=mTextValue.Length();
+  for(i=0;i<theLen;i++){
     anOutputStream << char(mTextValue.CharAt(i));
   }
   anOutputStream << " TypeID: " << mTypeID << " AttrCount: " << mAttrCount << nsEndl;
diff --git a/mozilla/parser/htmlparser/src/CParserContext.cpp b/mozilla/parser/htmlparser/src/CParserContext.cpp
index 9a12c2b1db2..eaab4f10d76 100644
--- a/mozilla/parser/htmlparser/src/CParserContext.cpp
+++ b/mozilla/parser/htmlparser/src/CParserContext.cpp
@@ -93,7 +93,6 @@ CParserContext::CParserContext(const CParserContext &aContext) : mMimeType() {
   mStreamListenerState=aContext.mStreamListenerState;
   mMultipart=aContext.mMultipart;
   mContextType=aContext.mContextType;
-  mCopyUnused;
   mChannel=aContext.mChannel;
   mParserCommand=aContext.mParserCommand;
   SetMimeType(aContext.mMimeType);
diff --git a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
index 0b351f228ff..bbb5b6a2f1b 100644
--- a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
+++ b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
@@ -1039,7 +1039,6 @@ CObserverService::~CObserverService() {
 }
 
 nsObserverTopic* CObserverService::GetTopic(const nsString& aTopic) {
-  PRInt32 theSize=mTopics.GetSize();
   PRInt32 theIndex=0;
   nsObserverTopic *theTopic=(nsObserverTopic*)mTopics.ObjectAt(theIndex++);
 
diff --git a/mozilla/parser/htmlparser/src/nsElementTable.cpp b/mozilla/parser/htmlparser/src/nsElementTable.cpp
index 71f2f93e702..7a3d79aacb2 100644
--- a/mozilla/parser/htmlparser/src/nsElementTable.cpp
+++ b/mozilla/parser/htmlparser/src/nsElementTable.cpp
@@ -170,7 +170,7 @@ void Initialize(eHTMLTags aTag,
                 int       aInclusionBits, 
                 int       aExclusionBits,     
                 int       aSpecialProperties,
-                int       aPropagateRange,
+                PRUint32  aPropagateRange,
                 TagList*  aSpecialParents,    
                 TagList*  aSpecialKids,    
                 eHTMLTags aSkipTarget
diff --git a/mozilla/parser/htmlparser/src/nsElementTable.h b/mozilla/parser/htmlparser/src/nsElementTable.h
index 25b010466c5..b659f212971 100644
--- a/mozilla/parser/htmlparser/src/nsElementTable.h
+++ b/mozilla/parser/htmlparser/src/nsElementTable.h
@@ -200,7 +200,7 @@ struct nsHTMLElement {
   int             mInclusionBits;     //defines parental and containment rules
   int             mExclusionBits;     //defines things you CANNOT contain
   int             mSpecialProperties; //used for various special purposes...
-  int             mPropagateRange;    //tells us how far a parent is willing to prop. badly formed children
+  PRUint32        mPropagateRange;    //tells us how far a parent is willing to prop. badly formed children
   TagList*        mSpecialParents;    //These are the special tags that contain this tag (directly)
   TagList*        mSpecialKids;       //These are the extra things you can contain
   eHTMLTags       mSkipTarget;        //If set, then we skip all content until this tag is seen
diff --git a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp
index 19553e4a15b..df50571a7bc 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp
@@ -1010,7 +1010,9 @@ PRBool nsHTMLContentSinkStream::HasLongLines(const nsString& text)
 {
   const PRInt32 longLineLen = 128;
   nsString str = text;
-  for (PRInt32 start = 0; start < text.Length(); )
+  PRUint32 start=0;
+  PRUint32 theLen=text.Length();
+  for (start = 0; start < theLen; )
   {
     PRInt32 eol = text.FindChar('\n', PR_FALSE, start);
     if (eol < 0) eol = text.Length();
diff --git a/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp b/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp
index e6af5b9817f..6824fd74110 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp
@@ -401,14 +401,6 @@ PRBool nsHTMLToTXTSinkStream::DoOutput()
   return mDoFragment || inBody;
 }
 
-nsAutoString
-Spaces(PRInt32 count)
-{
-  nsAutoString result;
-  while (result.Length() < count)
-    result += ' ';
-  return result;
-}
     
 /**
   * This method is used to a general container. 
@@ -818,7 +810,7 @@ nsHTMLToTXTSinkStream::AddLeaf(const nsIParserNode& aNode)
 
     // Make a line of dashes as wide as the wrap width
     nsAutoString line;
-    int width = (mWrapColumn > 0 ? mWrapColumn : 25);
+    PRUint32 width = (mWrapColumn > 0 ? mWrapColumn : 25);
     while (line.Length() < width)
       line += '-';
     Write(line);
diff --git a/mozilla/parser/htmlparser/src/nsIParser.h b/mozilla/parser/htmlparser/src/nsIParser.h
index 4ae678bcecb..59f45ffab51 100644
--- a/mozilla/parser/htmlparser/src/nsIParser.h
+++ b/mozilla/parser/htmlparser/src/nsIParser.h
@@ -56,7 +56,7 @@ class nsIURI;
 enum eParserCommands {
   eViewNormal,
   eViewSource,
-  eViewErrors,
+  eViewErrors
 };
 
 enum eCRCQuality {
diff --git a/mozilla/parser/htmlparser/src/nsScanner.cpp b/mozilla/parser/htmlparser/src/nsScanner.cpp
index b64bfc859d9..34ac6a43252 100644
--- a/mozilla/parser/htmlparser/src/nsScanner.cpp
+++ b/mozilla/parser/htmlparser/src/nsScanner.cpp
@@ -257,7 +257,7 @@ PRBool nsScanner::Insert(const nsString& aBuffer) {
  */
 PRBool nsScanner::Append(const nsString& aBuffer) {
 
-  PRInt32 theLen=mBuffer.Length();
+  PRUint32 theLen=mBuffer.Length();
 
   mBuffer.Append(aBuffer);
   mTotalRead+=aBuffer.Length();
@@ -279,7 +279,7 @@ PRBool nsScanner::Append(const nsString& aBuffer) {
  */
 PRBool nsScanner::Append(const char* aBuffer, PRUint32 aLen){
 
-  PRInt32 theLen=mBuffer.Length();
+  PRUint32 theLen=mBuffer.Length();
   
   if(mUnicodeDecoder) {
     PRInt32 unicharBufLen = 0;
@@ -345,7 +345,7 @@ PRBool nsScanner::Append(const PRUnichar* aBuffer, PRUint32 aLen){
   CBufDescriptor theDesc(aBuffer,PR_TRUE, aLen+1,aLen);
   nsAutoString theBuffer(theDesc);  
 
-  PRInt32 theLen=mBuffer.Length();  
+  PRUint32 theLen=mBuffer.Length();  
   mBuffer.Append(theBuffer);
   mTotalRead+=aLen;
 
diff --git a/mozilla/parser/htmlparser/src/nsToken.cpp b/mozilla/parser/htmlparser/src/nsToken.cpp
index 4092e4bd01c..c4667a7630b 100644
--- a/mozilla/parser/htmlparser/src/nsToken.cpp
+++ b/mozilla/parser/htmlparser/src/nsToken.cpp
@@ -137,8 +137,9 @@ nsresult CToken::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode) {
  */
 void CToken::DebugDumpToken(nsOutputStream& anOutputStream) {
   anOutputStream << "[" << GetClassName() << "] ";
-  int i=0;
-  for(i=0;i<mTextValue.Length();i++){
+  PRUint32 i=0;
+  PRUint32 theLen=mTextValue.Length();
+  for(i=0;i<theLen;i++){
     anOutputStream << char(mTextValue.CharAt(i));
   }
   anOutputStream << " TypeID: " << mTypeID << " AttrCount: " << mAttrCount << nsEndl;