Fix JavaScriptGlue, WebCore and WebKit to build without warnings using GCC 4.2.

Reviewed by Eric.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27951 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptGlue/ChangeLog b/JavaScriptGlue/ChangeLog
index 57df5cfed4e999faa1c41b78ce7d6c6cdb48c2bc..c89c30996d1755e8907b8d519af13ee2b279fb19 100644 (file)
--- a/JavaScriptGlue/ChangeLog
+++ b/JavaScriptGlue/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-21  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Eric.
+
+        Fix JavaScriptGlue to build without warnings using GCC 4.2.
+
+        * Configurations/Base.xcconfig:
+        * JSRun.h:
+
 2007-11-17  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Darin Adler.

diff --git a/JavaScriptGlue/Configurations/Base.xcconfig b/JavaScriptGlue/Configurations/Base.xcconfig
index 9078d60666131eb047f0d22e125955569d63ebe1..15bbbea409a48ab719985b081081aea2f4340622 100644 (file)
--- a/JavaScriptGlue/Configurations/Base.xcconfig
+++ b/JavaScriptGlue/Configurations/Base.xcconfig
@@ -23,7 +23,7 @@ LINKER_DISPLAYS_MANGLED_NAMES = YES;
 PREBINDING = NO;
 VALID_ARCHS = i386 ppc x86_64 ppc64;
 WARNING_CFLAGS = $(WARNING_CFLAGS_$(CURRENT_ARCH));
-WARNING_CFLAGS_BASE = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wno-long-double -Wundef -Wno-strict-aliasing;
+WARNING_CFLAGS_BASE = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef -Wno-strict-aliasing;
 WARNING_CFLAGS_ = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
 WARNING_CFLAGS_i386 = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
 WARNING_CFLAGS_ppc = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;

diff --git a/JavaScriptGlue/JSRun.h b/JavaScriptGlue/JSRun.h
index 98f38b1b4cd40afebe0f0abb800b978b867721b1..52217a5d4a1b97893f389620cd36ce42af1b5c7b 100644 (file)
--- a/JavaScriptGlue/JSRun.h
+++ b/JavaScriptGlue/JSRun.h
@@ -40,7 +40,7 @@ class JSInterpreter : public Interpreter {
         JSFlags Flags() const { return fJSFlags; }
 
     protected:
-        virtual JSInterpreter::~JSInterpreter() { } // only deref on the base class should delete us
+        virtual ~JSInterpreter() { } // only deref on the base class should delete us
 
     private:
         JSFlags fJSFlags;

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 12fbe2398874fee15c070b863110db25ad85463e..01200939f7cef7df9d09fbb65e4c45e1bfb3ca7a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,31 @@
+2007-11-21  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Eric.
+
+        Fix WebCore to build without warnings under GCC 4.2.
+
+        * Configurations/Base.xcconfig:
+        * css/CSSRuleList.cpp:
+        (WebCore::CSSRuleList::deleteRule):
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::locateSharedStyle):
+        * html/HTMLParser.cpp:
+        (WebCore::HTMLParser::allowNestedRedundantTag):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::fillInlineSelectionGaps):
+        (WebCore::RenderBlock::fillBlockSelectionGaps):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::stackingContext):
+        (WebCore::RenderLayer::enclosingPositionedAncestor):
+        (WebCore::RenderLayer::transparentAncestor):
+        * rendering/RenderStyle.cpp:
+        (WebCore::BackgroundLayer::fillUnsetProperties):
+        (WebCore::Transition::fillUnsetProperties):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::containsOnlyWhitespace):
+        * rendering/bidi.cpp:
+        (WebCore::RenderBlock::determineStartPosition):
+
 2007-11-21  Alp Toker  <alp@atoker.com>
 
         Reviewed by Mark Rowe.

diff --git a/WebCore/Configurations/Base.xcconfig b/WebCore/Configurations/Base.xcconfig
index a85e17145ff6e1272a21e3994eddf48558ab00f1..d1b8fad348c67ef014f60e116ce6c499a64a5ccd 100644 (file)
--- a/WebCore/Configurations/Base.xcconfig
+++ b/WebCore/Configurations/Base.xcconfig
@@ -21,7 +21,7 @@ LINKER_DISPLAYS_MANGLED_NAMES = YES;
 PREBINDING = NO;
 VALID_ARCHS = i386 ppc x86_64 ppc64;
 WARNING_CFLAGS = $(WARNING_CFLAGS_$(CURRENT_ARCH));
-WARNING_CFLAGS_BASE = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wno-long-double -Wundef;
+WARNING_CFLAGS_BASE = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef;
 WARNING_CFLAGS_ = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
 WARNING_CFLAGS_i386 = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;
 WARNING_CFLAGS_ppc = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32;

diff --git a/WebCore/css/CSSRuleList.cpp b/WebCore/css/CSSRuleList.cpp
index 5dc8158f24cb48c194fc115abc6849dab14ab75b..ce3034448c9dd0745059776342e325a35c19b4d6 100644 (file)
--- a/WebCore/css/CSSRuleList.cpp
+++ b/WebCore/css/CSSRuleList.cpp
@@ -57,8 +57,7 @@ void CSSRuleList::deleteRule(unsigned index)
     CSSRule* rule = m_lstCSSRules.take(index);
     if (rule)
         rule->deref();
-    else
-        ; // FIXME: Throw INDEX_SIZE_ERR exception here
+    // FIXME: Throw INDEX_SIZE_ERR exception here if !rule
 }
 
 void CSSRuleList::append(CSSRule* rule)

diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index 4a1c3a702aea7e63e1a978ede750346c8f4b5070..186714586ff4259eb1cf49eef3a2cb6e937af8c3 100644 (file)
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -741,13 +741,13 @@ RenderStyle* CSSStyleSelector::locateSharedStyle()
         // Check previous siblings.
         unsigned count = 0;
         Node* n;
-        for (n = element->previousSibling(); n && !n->isElementNode(); n = n->previousSibling());
+        for (n = element->previousSibling(); n && !n->isElementNode(); n = n->previousSibling()) { }
         while (n) {
             if (canShareStyleWithElement(n))
                 return n->renderStyle();
             if (count++ == cStyleSearchThreshold)
                 return 0;
-            for (n = n->previousSibling(); n && !n->isElementNode(); n = n->previousSibling());
+            for (n = n->previousSibling(); n && !n->isElementNode(); n = n->previousSibling()) { }
         }
         if (!n) 
             n = locateCousinList(static_cast<Element*>(element->parentNode()));
@@ -756,7 +756,7 @@ RenderStyle* CSSStyleSelector::locateSharedStyle()
                 return n->renderStyle();
             if (count++ == cStyleSearchThreshold)
                 return 0;
-            for (n = n->previousSibling(); n && !n->isElementNode(); n = n->previousSibling());
+            for (n = n->previousSibling(); n && !n->isElementNode(); n = n->previousSibling()) { }
         }        
     }
     return 0;

diff --git a/WebCore/html/HTMLParser.cpp b/WebCore/html/HTMLParser.cpp
index 8d9491396a27be2f27da8ad8c91dc17647ecf580..87fcef606252d735e6ad8a4323fec292f4d67b34 100644 (file)
--- a/WebCore/html/HTMLParser.cpp
+++ b/WebCore/html/HTMLParser.cpp
@@ -838,7 +838,7 @@ bool HTMLParser::allowNestedRedundantTag(const AtomicString& tagName)
     unsigned i = 0;
     for (HTMLStackElem* curr = blockStack;
          i < cMaxRedundantTagDepth && curr && curr->tagName == tagName;
-         curr = curr->next, i++);
+         curr = curr->next, i++) { }
     return i != cMaxRedundantTagDepth;
 }
 

diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 39e8d42b5af5cbab805062d1a4af8cd468a6ef3f..33feb66d57b61a371b5d4cccd4f2f01f8701c13d 100644 (file)
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -1851,7 +1851,7 @@ GapRects RenderBlock::fillInlineSelectionGaps(RenderBlock* rootBlock, int blockX
 
     RootInlineBox* lastSelectedLine = 0;
     RootInlineBox* curr;
-    for (curr = firstRootBox(); curr && !curr->hasSelectedChildren(); curr = curr->nextRootBox());
+    for (curr = firstRootBox(); curr && !curr->hasSelectedChildren(); curr = curr->nextRootBox()) { }
 
     // Now paint the gaps for the lines.
     for (; curr && curr->hasSelectedChildren(); curr = curr->nextRootBox()) {
@@ -1889,7 +1889,7 @@ GapRects RenderBlock::fillBlockSelectionGaps(RenderBlock* rootBlock, int blockX,
 
     // Go ahead and jump right to the first block child that contains some selected objects.
     RenderObject* curr;
-    for (curr = firstChild(); curr && curr->selectionState() == SelectionNone; curr = curr->nextSibling());
+    for (curr = firstChild(); curr && curr->selectionState() == SelectionNone; curr = curr->nextSibling()) { }
 
     for (bool sawSelectionEnd = false; curr && !sawSelectionEnd; curr = curr->nextSibling()) {
         SelectionState childState = curr->selectionState();

diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp
index b5bdba8a67029e920443b53d963073cfac777cdc..852dee970519646f7dbf4172f1046bb4368a1d74 100644 (file)
--- a/WebCore/rendering/RenderLayer.cpp
+++ b/WebCore/rendering/RenderLayer.cpp
@@ -407,7 +407,7 @@ RenderLayer *RenderLayer::stackingContext() const
     RenderLayer* curr = parent();
     for ( ; curr && !curr->m_object->isRenderView() && !curr->m_object->isRoot() &&
           curr->m_object->style()->hasAutoZIndex();
-          curr = curr->parent());
+          curr = curr->parent()) { }
     return curr;
 }
 
@@ -417,7 +417,7 @@ RenderLayer::enclosingPositionedAncestor() const
     RenderLayer* curr = parent();
     for ( ; curr && !curr->m_object->isRenderView() && !curr->m_object->isRoot() &&
          !curr->m_object->isPositioned() && !curr->m_object->isRelPositioned();
-         curr = curr->parent());
+         curr = curr->parent()) { }
          
     return curr;
 }
@@ -436,7 +436,7 @@ RenderLayer*
 RenderLayer::transparentAncestor()
 {
     RenderLayer* curr = parent();
-    for ( ; curr && !curr->isTransparent(); curr = curr->parent());
+    for ( ; curr && !curr->isTransparent(); curr = curr->parent()) { }
     return curr;
 }
 

diff --git a/WebCore/rendering/RenderStyle.cpp b/WebCore/rendering/RenderStyle.cpp
index fa48d2b6d8ff7226be5046e95e2da38997a7a5d8..a52dc481b542a877bcf905764924c8db3ac9362e 100644 (file)
--- a/WebCore/rendering/RenderStyle.cpp
+++ b/WebCore/rendering/RenderStyle.cpp
@@ -200,7 +200,7 @@ bool BackgroundLayer::operator==(const BackgroundLayer& o) const
 void BackgroundLayer::fillUnsetProperties()
 {
     BackgroundLayer* curr;
-    for (curr = this; curr && curr->isBackgroundImageSet(); curr = curr->next());
+    for (curr = this; curr && curr->isBackgroundImageSet(); curr = curr->next()) { }
     if (curr && curr != this) {
         // We need to fill in the remaining values with the pattern specified.
         for (BackgroundLayer* pattern = this; curr; curr = curr->next()) {
@@ -211,7 +211,7 @@ void BackgroundLayer::fillUnsetProperties()
         }
     }
     
-    for (curr = this; curr && curr->isBackgroundXPositionSet(); curr = curr->next());
+    for (curr = this; curr && curr->isBackgroundXPositionSet(); curr = curr->next()) { }
     if (curr && curr != this) {
         // We need to fill in the remaining values with the pattern specified.
         for (BackgroundLayer* pattern = this; curr; curr = curr->next()) {
@@ -222,7 +222,7 @@ void BackgroundLayer::fillUnsetProperties()
         }
     }
     
-    for (curr = this; curr && curr->isBackgroundYPositionSet(); curr = curr->next());
+    for (curr = this; curr && curr->isBackgroundYPositionSet(); curr = curr->next()) { }
     if (curr && curr != this) {
         // We need to fill in the remaining values with the pattern specified.
         for (BackgroundLayer* pattern = this; curr; curr = curr->next()) {
@@ -233,7 +233,7 @@ void BackgroundLayer::fillUnsetProperties()
         }
     }
     
-    for (curr = this; curr && curr->isBackgroundAttachmentSet(); curr = curr->next());
+    for (curr = this; curr && curr->isBackgroundAttachmentSet(); curr = curr->next()) { }
     if (curr && curr != this) {
         // We need to fill in the remaining values with the pattern specified.
         for (BackgroundLayer* pattern = this; curr; curr = curr->next()) {
@@ -244,7 +244,7 @@ void BackgroundLayer::fillUnsetProperties()
         }
     }
     
-    for (curr = this; curr && curr->isBackgroundClipSet(); curr = curr->next());
+    for (curr = this; curr && curr->isBackgroundClipSet(); curr = curr->next()) { }
     if (curr && curr != this) {
         // We need to fill in the remaining values with the pattern specified.
         for (BackgroundLayer* pattern = this; curr; curr = curr->next()) {
@@ -255,7 +255,7 @@ void BackgroundLayer::fillUnsetProperties()
         }
     }
 
-    for (curr = this; curr && curr->isBackgroundCompositeSet(); curr = curr->next());
+    for (curr = this; curr && curr->isBackgroundCompositeSet(); curr = curr->next()) { }
     if (curr && curr != this) {
         // We need to fill in the remaining values with the pattern specified.
         for (BackgroundLayer* pattern = this; curr; curr = curr->next()) {
@@ -266,7 +266,7 @@ void BackgroundLayer::fillUnsetProperties()
         }
     }
 
-    for (curr = this; curr && curr->isBackgroundOriginSet(); curr = curr->next());
+    for (curr = this; curr && curr->isBackgroundOriginSet(); curr = curr->next()) { }
     if (curr && curr != this) {
         // We need to fill in the remaining values with the pattern specified.
         for (BackgroundLayer* pattern = this; curr; curr = curr->next()) {
@@ -277,7 +277,7 @@ void BackgroundLayer::fillUnsetProperties()
         }
     }
 
-    for (curr = this; curr && curr->isBackgroundRepeatSet(); curr = curr->next());
+    for (curr = this; curr && curr->isBackgroundRepeatSet(); curr = curr->next()) { }
     if (curr && curr != this) {
         // We need to fill in the remaining values with the pattern specified.
         for (BackgroundLayer* pattern = this; curr; curr = curr->next()) {
@@ -288,7 +288,7 @@ void BackgroundLayer::fillUnsetProperties()
         }
     }
     
-    for (curr = this; curr && curr->isBackgroundSizeSet(); curr = curr->next());
+    for (curr = this; curr && curr->isBackgroundSizeSet(); curr = curr->next()) { }
     if (curr && curr != this) {
         // We need to fill in the remaining values with the pattern specified.
         for (BackgroundLayer* pattern = this; curr; curr = curr->next()) {
@@ -598,7 +598,7 @@ bool Transition::operator==(const Transition& o) const
 void Transition::fillUnsetProperties()
 {
     Transition* curr;
-    for (curr = this; curr && curr->isTransitionDurationSet(); curr = curr->next());
+    for (curr = this; curr && curr->isTransitionDurationSet(); curr = curr->next()) { }
     if (curr && curr != this) {
         // We need to fill in the remaining values with the pattern specified.
         for (Transition* pattern = this; curr; curr = curr->next()) {
@@ -609,7 +609,7 @@ void Transition::fillUnsetProperties()
         }
     }
     
-    for (curr = this; curr && curr->isTransitionRepeatCountSet(); curr = curr->next());
+    for (curr = this; curr && curr->isTransitionRepeatCountSet(); curr = curr->next()) { }
     if (curr && curr != this) {
         // We need to fill in the remaining values with the pattern specified.
         for (Transition* pattern = this; curr; curr = curr->next()) {
@@ -620,7 +620,7 @@ void Transition::fillUnsetProperties()
         }
     }
     
-    for (curr = this; curr && curr->isTransitionTimingFunctionSet(); curr = curr->next());
+    for (curr = this; curr && curr->isTransitionTimingFunctionSet(); curr = curr->next()) { }
     if (curr && curr != this) {
         // We need to fill in the remaining values with the pattern specified.
         for (Transition* pattern = this; curr; curr = curr->next()) {
@@ -631,7 +631,7 @@ void Transition::fillUnsetProperties()
         }
     }
 
-    for (curr = this; curr && curr->isTransitionPropertySet(); curr = curr->next());
+    for (curr = this; curr && curr->isTransitionPropertySet(); curr = curr->next()) { }
     if (curr && curr != this) {
         // We need to fill in the remaining values with the pattern specified.
         for (Transition* pattern = this; curr; curr = curr->next()) {

diff --git a/WebCore/rendering/RenderText.cpp b/WebCore/rendering/RenderText.cpp
index 1072508dce4cc5efc106dec1b24f633e1388be1e..de754b04062671423502898cfc1196557b978a83 100644 (file)
--- a/WebCore/rendering/RenderText.cpp
+++ b/WebCore/rendering/RenderText.cpp
@@ -702,7 +702,7 @@ bool RenderText::containsOnlyWhitespace(unsigned from, unsigned len) const
     unsigned currPos;
     for (currPos = from;
          currPos < from + len && ((*m_text)[currPos] == '\n' || (*m_text)[currPos] == ' ' || (*m_text)[currPos] == '\t');
-         currPos++);
+         currPos++) { }
     return currPos >= (from + len);
 }
 

diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp
index 97bfe1d2bcd23f57a9306e3f6b903023c477185a..1a834a313ff048a4f5754c6b58594f79fce09a31 100644 (file)
--- a/WebCore/rendering/bidi.cpp
+++ b/WebCore/rendering/bidi.cpp
@@ -1104,7 +1104,7 @@ RootInlineBox* RenderBlock::determineStartPosition(bool fullLayout, BidiIterator
             ASSERT(!firstLineBox() && !lastLineBox());
         }
     } else {
-        for (curr = firstRootBox(); curr && !curr->isDirty(); curr = curr->nextRootBox());
+        for (curr = firstRootBox(); curr && !curr->isDirty(); curr = curr->nextRootBox()) { }
         if (curr) {
             // We have a dirty line.
             if (RootInlineBox* prevRootBox = curr->prevRootBox()) {

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 5c32b35d6988000fa9cc2f9c7ca58ccdf361a058..79849f2e34de4af831355db4fb66214b1e927e7b 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-21  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Eric.
+
+        Fix WebKit to build without warnings under GCC 4.2.
+
+        * Configurations/Base.xcconfig:
+
 2007-11-21  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Tim Hatcher.

diff --git a/WebKit/mac/Configurations/Base.xcconfig b/WebKit/mac/Configurations/Base.xcconfig
index 8bed2dcc6ecd29d56d377aab2e31c85593dcf74d..ad1ad9546e9dcfb81f8d169f26d0c8306f1b3e98 100644 (file)
--- a/WebKit/mac/Configurations/Base.xcconfig
+++ b/WebKit/mac/Configurations/Base.xcconfig
@@ -21,7 +21,7 @@ LINKER_DISPLAYS_MANGLED_NAMES = YES;
 PREBINDING = NO;
 VALID_ARCHS = i386 ppc x86_64 ppc64;
 // FIXME: <rdar://problem/5070292> WebKit should build with -Wshorten-64-to-32
-WARNING_CFLAGS = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wno-long-double -Wundef;
+WARNING_CFLAGS = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef;
 
 
 // <rdar://problem/5488678>: Production builds on 10.4 PowerPC need to have debugging symbols disabled to prevent a huge STABS section being generated.