Reviewed by Oliver.

        - rename String::sprintf and DeprecatedString::sprintf to ...::format to avoid needlessly tweaking a search
        for insecure functions. Neither of these has risk of buffer overruns since they calculate the buffer size
        for you and use vsnprintf.

        * bindings/js/kjs_window.cpp:
        (KJS::Window::isSafeScript):
        * css/cssparser.cpp:
        (WebCore::CSSParser::parseColorFromValue):
        * dom/StyledElement.cpp:
        (WebCore::StyledElement::addCSSColor):
        * dom/XMLTokenizer.cpp:
        (WebCore::XMLTokenizer::handleError):
        * ksvg2/css/SVGCSSParser.cpp:
        (WebCore::CSSParser::parseSVGPaint):
        (WebCore::CSSParser::parseSVGColor):
        * ksvg2/svg/SVGPathSegArc.h:
        (WebCore::SVGPathSegArcAbs::toString):
        (WebCore::SVGPathSegArcRel::toString):
        * ksvg2/svg/SVGPathSegCurvetoCubic.h:
        (WebCore::SVGPathSegCurvetoCubicAbs::toString):
        (WebCore::SVGPathSegCurvetoCubicRel::toString):
        * ksvg2/svg/SVGPathSegCurvetoCubicSmooth.h:
        (WebCore::SVGPathSegCurvetoCubicSmoothAbs::toString):
        (WebCore::SVGPathSegCurvetoCubicSmoothRel::toString):
        * ksvg2/svg/SVGPathSegCurvetoQuadratic.h:
        (WebCore::SVGPathSegCurvetoQuadraticAbs::toString):
        (WebCore::SVGPathSegCurvetoQuadraticRel::toString):
        * ksvg2/svg/SVGPathSegCurvetoQuadraticSmooth.h:
        (WebCore::SVGPathSegCurvetoQuadraticSmoothAbs::toString):
        (WebCore::SVGPathSegCurvetoQuadraticSmoothRel::toString):
        * ksvg2/svg/SVGPathSegLineto.h:
        (WebCore::SVGPathSegLinetoAbs::toString):
        (WebCore::SVGPathSegLinetoRel::toString):
        * ksvg2/svg/SVGPathSegLinetoHorizontal.h:
        (WebCore::SVGPathSegLinetoHorizontalAbs::toString):
        (WebCore::SVGPathSegLinetoHorizontalRel::toString):
        * ksvg2/svg/SVGPathSegLinetoVertical.h:
        (WebCore::SVGPathSegLinetoVerticalAbs::toString):
        (WebCore::SVGPathSegLinetoVerticalRel::toString):
        * ksvg2/svg/SVGPathSegMoveto.h:
        (WebCore::SVGPathSegMovetoAbs::toString):
        (WebCore::SVGPathSegMovetoRel::toString):
        * ksvg2/svg/SVGPolyElement.cpp:
        (WebCore::SVGPolyElement::notifyAttributeChange):
        * ksvg2/svg/SVGUseElement.cpp:
        (WebCore::SVGUseElement::closeRenderer):
        * loader/icon/IconDatabase.cpp:
        (WebCore::IconDatabase::forgetIconForIconURLFromDatabase):
        * loader/icon/SQLDatabase.cpp:
        (WebCore::SQLDatabase::setSynchronous):
        * platform/Color.cpp:
        (WebCore::Color::name):
        * platform/DeprecatedString.cpp:
        (WebCore::DeprecatedString::setNum):
        (WebCore::DeprecatedString::format):
        * platform/DeprecatedString.h:
        * platform/PlatformString.h:
        * platform/String.cpp:
        (WebCore::String::format):
        (WebCore::String::number):
        * platform/mac/KeyEventMac.mm:
        (WebCore::keyIdentifierForKeyEvent):
        * platform/win/KeyEventWin.cpp:
        (WebCore::keyIdentifierForWindowsKeyCode):
        * rendering/RenderListMarker.cpp:
        (WebCore::RenderListMarker::calcMinMaxWidth):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f57b170773ce434cbf5c57bad4034f62305d5f05..ad6f91adf5ecb63f9a2bebce39c1bc040c7e931c 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,74 @@
+2006-11-09  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Oliver.
+
+        - rename String::sprintf and DeprecatedString::sprintf to ...::format to avoid needlessly tweaking a search
+        for insecure functions. Neither of these has risk of buffer overruns since they calculate the buffer size
+        for you and use vsnprintf.
+
+        * bindings/js/kjs_window.cpp:
+        (KJS::Window::isSafeScript):
+        * css/cssparser.cpp:
+        (WebCore::CSSParser::parseColorFromValue):
+        * dom/StyledElement.cpp:
+        (WebCore::StyledElement::addCSSColor):
+        * dom/XMLTokenizer.cpp:
+        (WebCore::XMLTokenizer::handleError):
+        * ksvg2/css/SVGCSSParser.cpp:
+        (WebCore::CSSParser::parseSVGPaint):
+        (WebCore::CSSParser::parseSVGColor):
+        * ksvg2/svg/SVGPathSegArc.h:
+        (WebCore::SVGPathSegArcAbs::toString):
+        (WebCore::SVGPathSegArcRel::toString):
+        * ksvg2/svg/SVGPathSegCurvetoCubic.h:
+        (WebCore::SVGPathSegCurvetoCubicAbs::toString):
+        (WebCore::SVGPathSegCurvetoCubicRel::toString):
+        * ksvg2/svg/SVGPathSegCurvetoCubicSmooth.h:
+        (WebCore::SVGPathSegCurvetoCubicSmoothAbs::toString):
+        (WebCore::SVGPathSegCurvetoCubicSmoothRel::toString):
+        * ksvg2/svg/SVGPathSegCurvetoQuadratic.h:
+        (WebCore::SVGPathSegCurvetoQuadraticAbs::toString):
+        (WebCore::SVGPathSegCurvetoQuadraticRel::toString):
+        * ksvg2/svg/SVGPathSegCurvetoQuadraticSmooth.h:
+        (WebCore::SVGPathSegCurvetoQuadraticSmoothAbs::toString):
+        (WebCore::SVGPathSegCurvetoQuadraticSmoothRel::toString):
+        * ksvg2/svg/SVGPathSegLineto.h:
+        (WebCore::SVGPathSegLinetoAbs::toString):
+        (WebCore::SVGPathSegLinetoRel::toString):
+        * ksvg2/svg/SVGPathSegLinetoHorizontal.h:
+        (WebCore::SVGPathSegLinetoHorizontalAbs::toString):
+        (WebCore::SVGPathSegLinetoHorizontalRel::toString):
+        * ksvg2/svg/SVGPathSegLinetoVertical.h:
+        (WebCore::SVGPathSegLinetoVerticalAbs::toString):
+        (WebCore::SVGPathSegLinetoVerticalRel::toString):
+        * ksvg2/svg/SVGPathSegMoveto.h:
+        (WebCore::SVGPathSegMovetoAbs::toString):
+        (WebCore::SVGPathSegMovetoRel::toString):
+        * ksvg2/svg/SVGPolyElement.cpp:
+        (WebCore::SVGPolyElement::notifyAttributeChange):
+        * ksvg2/svg/SVGUseElement.cpp:
+        (WebCore::SVGUseElement::closeRenderer):
+        * loader/icon/IconDatabase.cpp:
+        (WebCore::IconDatabase::forgetIconForIconURLFromDatabase):
+        * loader/icon/SQLDatabase.cpp:
+        (WebCore::SQLDatabase::setSynchronous):
+        * platform/Color.cpp:
+        (WebCore::Color::name):
+        * platform/DeprecatedString.cpp:
+        (WebCore::DeprecatedString::setNum):
+        (WebCore::DeprecatedString::format):
+        * platform/DeprecatedString.h:
+        * platform/PlatformString.h:
+        * platform/String.cpp:
+        (WebCore::String::format):
+        (WebCore::String::number):
+        * platform/mac/KeyEventMac.mm:
+        (WebCore::keyIdentifierForKeyEvent):
+        * platform/win/KeyEventWin.cpp:
+        (WebCore::keyIdentifierForWindowsKeyCode):
+        * rendering/RenderListMarker.cpp:
+        (WebCore::RenderListMarker::calcMinMaxWidth):
+
 2006-11-09  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Anders.

diff --git a/WebCore/bindings/js/kjs_window.cpp b/WebCore/bindings/js/kjs_window.cpp
index be88e8fad1648c221c748811de08a2be0a890e6d..7175e61bb9dfe87674166fe39525134c6fe5ed4f 100644 (file)
--- a/WebCore/bindings/js/kjs_window.cpp
+++ b/WebCore/bindings/js/kjs_window.cpp
@@ -1213,7 +1213,7 @@ bool Window::isSafeScript(const ScriptInterpreter *origin, const ScriptInterpret
         printf("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n", 
              targetDocument->URL().latin1(), originDocument->URL().latin1());
     }
-    String message = String::sprintf("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n", 
+    String message = String::format("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n", 
                   targetDocument->URL().latin1(), originDocument->URL().latin1());
     targetFrame->addMessageToConsole(message, 1, String()); //fixme: provide a real line number and sourceurl
 
@@ -1273,7 +1273,7 @@ bool Window::isSafeScript(ExecState *exec) const
       printf("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n", 
              thisDocument->URL().latin1(), actDocument->URL().latin1());
   }
-  String message = String::sprintf("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n", 
+  String message = String::format("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n", 
                   thisDocument->URL().latin1(), actDocument->URL().latin1());
   m_frame->addMessageToConsole(message, 1, String());
   

diff --git a/WebCore/css/cssparser.cpp b/WebCore/css/cssparser.cpp
index dd3882f2a40574eac5663ec6e120215376561626..2b0187221d11d6e8ec772ed98f01bde0bacdffb8 100644 (file)
--- a/WebCore/css/cssparser.cpp
+++ b/WebCore/css/cssparser.cpp
@@ -2439,7 +2439,7 @@ CSSPrimitiveValue *CSSParser::parseColorFromValue(Value* value)
     if (!strict && value->unit == CSSPrimitiveValue::CSS_NUMBER &&
         value->fValue >= 0. && value->fValue < 1000000.) {
         DeprecatedString str;
-        str.sprintf("%06d", (int)(value->fValue+.5));
+        str.format("%06d", (int)(value->fValue+.5));
         if (!CSSParser::parseColor(str, c))
             return 0;
     } else if (value->unit == CSSPrimitiveValue::CSS_RGBCOLOR ||

diff --git a/WebCore/dom/StyledElement.cpp b/WebCore/dom/StyledElement.cpp
index 544e9bccbe58107db8ec2116617d0f694a9b40fb..120536ed0973c462784160515483f24936710534 100644 (file)
--- a/WebCore/dom/StyledElement.cpp
+++ b/WebCore/dom/StyledElement.cpp
@@ -384,7 +384,7 @@ void StyledElement::addCSSColor(MappedAttribute* attr, int id, const String &c)
             colors[2] >>= 4*maxDigit;
             // assert(colors[0] < 0x100 && colors[1] < 0x100 && colors[2] < 0x100);
             
-            color = String::sprintf("#%02x%02x%02x", colors[0], colors[1], colors[2]);
+            color = String::format("#%02x%02x%02x", colors[0], colors[1], colors[2]);
             if (attr->decl()->setProperty(id, color, false))
                 return;
         }

diff --git a/WebCore/dom/XMLTokenizer.cpp b/WebCore/dom/XMLTokenizer.cpp
index d84e881e59632b7cb2fa409cf716ec3c64696ad5..38a380a5faf0dfb414a847b20be49b0c43d87b6c 100644 (file)
--- a/WebCore/dom/XMLTokenizer.cpp
+++ b/WebCore/dom/XMLTokenizer.cpp
@@ -902,11 +902,11 @@ void XMLTokenizer::handleError(ErrorType type, const char* m, int lineNumber, in
     if (type == fatal || (m_errorCount < maxErrors && m_lastErrorLine != lineNumber && m_lastErrorColumn != columnNumber)) {
         switch (type) {
             case warning:
-                m_errorMessages += String::sprintf("warning on line %d at column %d: %s", lineNumber, columnNumber, m);
+                m_errorMessages += String::format("warning on line %d at column %d: %s", lineNumber, columnNumber, m);
                 break;
             case fatal:
             case nonFatal:
-                m_errorMessages += String::sprintf("error on line %d at column %d: %s", lineNumber, columnNumber, m);
+                m_errorMessages += String::format("error on line %d at column %d: %s", lineNumber, columnNumber, m);
         }
         
         m_lastErrorLine = lineNumber;

diff --git a/WebCore/ksvg2/css/SVGCSSParser.cpp b/WebCore/ksvg2/css/SVGCSSParser.cpp
index d57888240f2657778cd0d629be4e1d2cbe206929..0879c5d0ed00f6d7bea037070ed2db228b4f03e2 100644 (file)
--- a/WebCore/ksvg2/css/SVGCSSParser.cpp
+++ b/WebCore/ksvg2/css/SVGCSSParser.cpp
@@ -351,7 +351,7 @@ CSSValue* CSSParser::parseSVGPaint()
     Value* value = valueList->current();
     if (!strict && value->unit == CSSPrimitiveValue::CSS_NUMBER &&
        value->fValue >= 0. && value->fValue < 1000000.) {
-        String str = String::sprintf("%06d", (int)(value->fValue+.5));
+        String str = String::format("%06d", (int)(value->fValue+.5));
         return new SVGPaint(SVGPaint::SVG_PAINTTYPE_RGBCOLOR, String(), str);
     } else if (value->unit == CSSPrimitiveValue::CSS_RGBCOLOR) {
         String str = "#" + domString(value->string);
@@ -384,7 +384,7 @@ CSSValue* CSSParser::parseSVGPaint()
         g = max(0, min(255, g));
         b = max(0, min(255, b));
         
-        return new SVGPaint(SVGPaint::SVG_PAINTTYPE_RGBCOLOR, String(), String::sprintf("rgb(%d, %d, %d)", r, g, b).impl());
+        return new SVGPaint(SVGPaint::SVG_PAINTTYPE_RGBCOLOR, String(), String::format("rgb(%d, %d, %d)", r, g, b).impl());
     }
     else
         return 0;
@@ -396,7 +396,7 @@ CSSValue* CSSParser::parseSVGColor()
 {
     Value* value = valueList->current();
     if (!strict && value->unit == CSSPrimitiveValue::CSS_NUMBER && value->fValue >= 0. && value->fValue < 1000000.)
-        return new SVGColor(String::sprintf("%06d", (int)(value->fValue+.5)).impl());
+        return new SVGColor(String::format("%06d", (int)(value->fValue+.5)).impl());
     else if (value->unit == CSSPrimitiveValue::CSS_RGBCOLOR) {
         String str = "#" + domString(value->string);
         return new SVGColor(str.impl());
@@ -426,7 +426,7 @@ CSSValue* CSSParser::parseSVGColor()
         g = max(0, min(255, g));
         b = max(0, min(255, b));
         
-        return new SVGColor(String::sprintf("rgb(%d, %d, %d)", r, g, b).impl());
+        return new SVGColor(String::format("rgb(%d, %d, %d)", r, g, b).impl());
     }
     else
         return 0;

diff --git a/WebCore/ksvg2/svg/SVGPathSegArc.h b/WebCore/ksvg2/svg/SVGPathSegArc.h
index 1d4057009c33111cf3114495a26617feded55915..f00c5e619bf4ba5314c290e98d7f1f919f86563d 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPathSegArc.h
+++ b/WebCore/ksvg2/svg/SVGPathSegArc.h
@@ -36,7 +36,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_ARC_ABS; }
         virtual String pathSegTypeAsLetter() const { return "A"; }
-        virtual String toString() const { return String::sprintf("A %.6lg %.6lg %.6lg %d %d %.6lg %.6lg", m_r1, m_r2, m_angle, m_largeArcFlag, m_sweepFlag, m_x, m_y); }
+        virtual String toString() const { return String::format("A %.6lg %.6lg %.6lg %d %d %.6lg %.6lg", m_r1, m_r2, m_angle, m_largeArcFlag, m_sweepFlag, m_x, m_y); }
 
         void setX(double x);
         double x() const;
@@ -78,7 +78,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_ARC_REL; }
         virtual String pathSegTypeAsLetter() const { return "a"; }
-        virtual String toString() const { return String::sprintf("a %.6lg %.6lg %.6lg %d %d %.6lg %.6lg", m_r1, m_r2, m_angle, m_largeArcFlag, m_sweepFlag, m_x, m_y); }
+        virtual String toString() const { return String::format("a %.6lg %.6lg %.6lg %d %d %.6lg %.6lg", m_r1, m_r2, m_angle, m_largeArcFlag, m_sweepFlag, m_x, m_y); }
 
         void setX(double x);
         double x() const;

diff --git a/WebCore/ksvg2/svg/SVGPathSegCurvetoCubic.h b/WebCore/ksvg2/svg/SVGPathSegCurvetoCubic.h
index 0db3f0812c4d50368b32dfbe44fc0444ee94ae65..0890b786196106062b55bf8e70384c5c887b5a78 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPathSegCurvetoCubic.h
+++ b/WebCore/ksvg2/svg/SVGPathSegCurvetoCubic.h
@@ -36,7 +36,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_ABS; }
         virtual String pathSegTypeAsLetter() const { return "C"; }
-        virtual String toString() const { return String::sprintf("C %.6lg %.6lg %.6lg %.6lg %.6lg %.6lg", m_x1, m_y1, m_x2, m_y2, m_x, m_y); }
+        virtual String toString() const { return String::format("C %.6lg %.6lg %.6lg %.6lg %.6lg %.6lg", m_x1, m_y1, m_x2, m_y2, m_x, m_y); }
 
         void setX(double);
         double x() const;
@@ -73,7 +73,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_REL; }
         virtual String pathSegTypeAsLetter() const { return "c"; }
-        virtual String toString() const { return String::sprintf("c %.6lg %.6lg %.6lg %.6lg %.6lg %.6lg", m_x1, m_y1, m_x2, m_y2, m_x, m_y); }
+        virtual String toString() const { return String::format("c %.6lg %.6lg %.6lg %.6lg %.6lg %.6lg", m_x1, m_y1, m_x2, m_y2, m_x, m_y); }
 
         void setX(double);
         double x() const;

diff --git a/WebCore/ksvg2/svg/SVGPathSegCurvetoCubicSmooth.h b/WebCore/ksvg2/svg/SVGPathSegCurvetoCubicSmooth.h
index 79e1cd422df2a0ed71c1bc1faede647622f04308..5e117dd53ff3b5d89f56e0d1892888ae8a82299e 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPathSegCurvetoCubicSmooth.h
+++ b/WebCore/ksvg2/svg/SVGPathSegCurvetoCubicSmooth.h
@@ -36,7 +36,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_SMOOTH_ABS; }
         virtual String pathSegTypeAsLetter() const { return "S"; }
-        virtual String toString() const { return String::sprintf("S %.6lg %.6lg %.6lg %.6lg", m_x2, m_y2, m_x, m_y); }
+        virtual String toString() const { return String::format("S %.6lg %.6lg %.6lg %.6lg", m_x2, m_y2, m_x, m_y); }
 
         void setX(double);
         double x() const;
@@ -65,7 +65,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_SMOOTH_REL; }
         virtual String pathSegTypeAsLetter() const { return "s"; }
-        virtual String toString() const { return String::sprintf("s %.6lg %.6lg %.6lg %.6lg", m_x2, m_y2, m_x, m_y); }
+        virtual String toString() const { return String::format("s %.6lg %.6lg %.6lg %.6lg", m_x2, m_y2, m_x, m_y); }
 
         void setX(double);
         double x() const;

diff --git a/WebCore/ksvg2/svg/SVGPathSegCurvetoQuadratic.h b/WebCore/ksvg2/svg/SVGPathSegCurvetoQuadratic.h
index 2af71083879f8ff6643c9d64ffaa7a3a7683894a..8564dff065e7be879abef8802e0b5535bf6bc9d3 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPathSegCurvetoQuadratic.h
+++ b/WebCore/ksvg2/svg/SVGPathSegCurvetoQuadratic.h
@@ -36,7 +36,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_QUADRATIC_ABS; }
         virtual String pathSegTypeAsLetter() const { return "Q"; }
-        virtual String toString() const { return String::sprintf("Q %.6lg %.6lg %.6lg %.6lg", m_x1, m_y1, m_x, m_y); }
+        virtual String toString() const { return String::format("Q %.6lg %.6lg %.6lg %.6lg", m_x1, m_y1, m_x, m_y); }
 
         void setX(double);
         double x() const;
@@ -65,7 +65,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_QUADRATIC_REL; }
         virtual String pathSegTypeAsLetter() const { return "q"; }
-        virtual String toString() const { return String::sprintf("q %.6lg %.6lg %.6lg %.6lg", m_x1, m_y1, m_x, m_y); }
+        virtual String toString() const { return String::format("q %.6lg %.6lg %.6lg %.6lg", m_x1, m_y1, m_x, m_y); }
  
         void setX(double);
         double x() const;

diff --git a/WebCore/ksvg2/svg/SVGPathSegCurvetoQuadraticSmooth.h b/WebCore/ksvg2/svg/SVGPathSegCurvetoQuadraticSmooth.h
index 02a72adbb3ee6bf7f766ff81777b0f1324e02f40..30e11f03c598c2b58bfc7fb17a5b80f6c138798b 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPathSegCurvetoQuadraticSmooth.h
+++ b/WebCore/ksvg2/svg/SVGPathSegCurvetoQuadraticSmooth.h
@@ -36,7 +36,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS; }
         virtual String pathSegTypeAsLetter() const { return "T"; }
-        virtual String toString() const { return String::sprintf("T %.6lg %.6lg", m_x, m_y); }
+        virtual String toString() const { return String::format("T %.6lg %.6lg", m_x, m_y); }
 
         void setX(double);
         double x() const;
@@ -57,7 +57,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL; }
         virtual String pathSegTypeAsLetter() const { return "t"; }
-        virtual String toString() const { return String::sprintf("t %.6lg %.6lg", m_x, m_y); }
+        virtual String toString() const { return String::format("t %.6lg %.6lg", m_x, m_y); }
 
         void setX(double);
         double x() const;

diff --git a/WebCore/ksvg2/svg/SVGPathSegLineto.h b/WebCore/ksvg2/svg/SVGPathSegLineto.h
index 78ed6b97a0a91ee8f0d704243bd41451f2f9f0f4..1949ada63aebc63ec1d4134ebfa9c9c29f354840 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPathSegLineto.h
+++ b/WebCore/ksvg2/svg/SVGPathSegLineto.h
@@ -36,7 +36,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_LINETO_ABS; }
         virtual String pathSegTypeAsLetter() const { return "L"; }
-        virtual String toString() const { return String::sprintf("L %.6lg %.6lg", m_x, m_y); }
+        virtual String toString() const { return String::format("L %.6lg %.6lg", m_x, m_y); }
 
         void setX(double);
         double x() const;
@@ -57,7 +57,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_LINETO_REL; }
         virtual String pathSegTypeAsLetter() const { return "l"; }
-        virtual String toString() const { return String::sprintf("l %.6lg %.6lg", m_x, m_y); }
+        virtual String toString() const { return String::format("l %.6lg %.6lg", m_x, m_y); }
 
         void setX(double);
         double x() const;

diff --git a/WebCore/ksvg2/svg/SVGPathSegLinetoHorizontal.h b/WebCore/ksvg2/svg/SVGPathSegLinetoHorizontal.h
index 8c9b2c854993a5f7a58a1bae1a62a83a9141bf18..78c380928777cac070d8753b68ac93eeb03de534 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPathSegLinetoHorizontal.h
+++ b/WebCore/ksvg2/svg/SVGPathSegLinetoHorizontal.h
@@ -36,7 +36,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_LINETO_HORIZONTAL_ABS; }
         virtual String pathSegTypeAsLetter() const { return "H"; }
-        virtual String toString() const { return String::sprintf("H %.6lg", m_x); }
+        virtual String toString() const { return String::format("H %.6lg", m_x); }
 
         void setX(double);
         double x() const;
@@ -53,7 +53,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_LINETO_HORIZONTAL_REL; }
         virtual String pathSegTypeAsLetter() const { return "h"; }
-        virtual String toString() const { return String::sprintf("h %.6lg", m_x); }
+        virtual String toString() const { return String::format("h %.6lg", m_x); }
 
         void setX(double);
         double x() const;

diff --git a/WebCore/ksvg2/svg/SVGPathSegLinetoVertical.h b/WebCore/ksvg2/svg/SVGPathSegLinetoVertical.h
index f352fad1e55f736092be50fda7f31114e50801a1..6673e03ff11249f4f8ce40f24719c2e9c9a3c59c 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPathSegLinetoVertical.h
+++ b/WebCore/ksvg2/svg/SVGPathSegLinetoVertical.h
@@ -36,7 +36,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_LINETO_VERTICAL_ABS; }
         virtual String pathSegTypeAsLetter() const { return "V"; }
-        virtual String toString() const { return String::sprintf("V %.6lg", m_y); }
+        virtual String toString() const { return String::format("V %.6lg", m_y); }
 
         void setY(double);
         double y() const;
@@ -53,7 +53,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_LINETO_VERTICAL_REL; }
         virtual String pathSegTypeAsLetter() const { return "v"; }
-        virtual String toString() const { return String::sprintf("v %.6lg", m_y); }
+        virtual String toString() const { return String::format("v %.6lg", m_y); }
 
         void setY(double);
         double y() const;

diff --git a/WebCore/ksvg2/svg/SVGPathSegMoveto.h b/WebCore/ksvg2/svg/SVGPathSegMoveto.h
index 6d634a2464d7e9f79c26288f68cb004be9f6659e..7285e643e9c8e990dea4c3b8dd3e26941410c3df 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPathSegMoveto.h
+++ b/WebCore/ksvg2/svg/SVGPathSegMoveto.h
@@ -36,7 +36,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_MOVETO_ABS; }
         virtual String pathSegTypeAsLetter() const { return "M"; }
-        virtual String toString() const { return String::sprintf("M %.6lg %.6lg", m_x, m_y); }
+        virtual String toString() const { return String::format("M %.6lg %.6lg", m_x, m_y); }
 
         void setX(double);
         double x() const;
@@ -57,7 +57,7 @@ namespace WebCore
 
         virtual unsigned short pathSegType() const { return PATHSEG_MOVETO_REL; }
         virtual String pathSegTypeAsLetter() const { return "m"; }
-        virtual String toString() const { return String::sprintf("m %.6lg %.6lg", m_x, m_y); }
+        virtual String toString() const { return String::format("m %.6lg %.6lg", m_x, m_y); }
 
         void setX(double);
         double x() const;

diff --git a/WebCore/ksvg2/svg/SVGPolyElement.cpp b/WebCore/ksvg2/svg/SVGPolyElement.cpp
index c7c36b4a7cd483854e2392298987eef25b7406cb..09c7c13a432c9b9e9ba4424e8e55222985402e20 100644 (file)
--- a/WebCore/ksvg2/svg/SVGPolyElement.cpp
+++ b/WebCore/ksvg2/svg/SVGPolyElement.cpp
@@ -92,7 +92,7 @@ void SVGPolyElement::notifyAttributeChange() const
     int len = points()->numberOfItems();
     for (int i = 0; i < len; ++i) {
         FloatPoint p = points()->getItem(i, ec);
-        _points += String::sprintf("%.6lg %.6lg ", p.x(), p.y());
+        _points += String::format("%.6lg %.6lg ", p.x(), p.y());
     }
 
     String p("points");

diff --git a/WebCore/ksvg2/svg/SVGUseElement.cpp b/WebCore/ksvg2/svg/SVGUseElement.cpp
index f2e52d1d434374c040ac2581e54503b9c64f98fc..7ccbf5b86c13f9f705260ac66c18d84b9f8eefb3 100644 (file)
--- a/WebCore/ksvg2/svg/SVGUseElement.cpp
+++ b/WebCore/ksvg2/svg/SVGUseElement.cpp
@@ -100,7 +100,7 @@ void SVGUseElement::closeRenderer()
     String hString = String::number(_h);
     
     ExceptionCode ec = 0;
-    String trans = String::sprintf("translate(%f, %f)", _x, _y);
+    String trans = String::format("translate(%f, %f)", _x, _y);
     if (target->hasTagName(SVGNames::symbolTag)) {
         RefPtr<SVGElement> dummy = new SVGSVGElement(SVGNames::svgTag, document());
         if (_w > 0)

diff --git a/WebCore/loader/icon/IconDatabase.cpp b/WebCore/loader/icon/IconDatabase.cpp
index 4cf4b8ac2bc80e425458a3c10b254cb14f6a8ba8..3754e5c38516f4ce079e1f8155d544a82917845c 100644 (file)
--- a/WebCore/loader/icon/IconDatabase.cpp
+++ b/WebCore/loader/icon/IconDatabase.cpp
@@ -610,9 +610,9 @@ void IconDatabase::forgetIconForIconURLFromDatabase(const String& iconURL)
         return;
     }
     
-    if (!m_currentDB->executeCommand(String::sprintf("DELETE FROM Icon WHERE Icon.iconID = %lli;", iconID)))
+    if (!m_currentDB->executeCommand(String::format("DELETE FROM Icon WHERE Icon.iconID = %lli;", iconID)))
         LOG_ERROR("Unable to drop Icon for IconURL", iconURL.ascii().data()); 
-    if (!m_currentDB->executeCommand(String::sprintf("DELETE FROM PageURL WHERE PageURL.iconID = %lli", iconID)))
+    if (!m_currentDB->executeCommand(String::format("DELETE FROM PageURL WHERE PageURL.iconID = %lli", iconID)))
         LOG_ERROR("Unable to drop all PageURL for IconURL", iconURL.ascii().data()); 
 }
 

diff --git a/WebCore/loader/icon/SQLDatabase.cpp b/WebCore/loader/icon/SQLDatabase.cpp
index f2458291e36339803a63d77fdfb8e9e451ec77ff..d2877ad2bc79ca9d5e3800bf86d0284564ba1dc9 100644 (file)
--- a/WebCore/loader/icon/SQLDatabase.cpp
+++ b/WebCore/loader/icon/SQLDatabase.cpp
@@ -84,7 +84,7 @@ void SQLDatabase::setFullsync(bool fsync)
 
 void SQLDatabase::setSynchronous(SynchronousPragma sync)
 {
-    executeCommand(String::sprintf("PRAGMA synchronous = %i", sync));
+    executeCommand(String::format("PRAGMA synchronous = %i", sync));
 }
 
 void SQLDatabase::setBusyTimeout(int ms)

diff --git a/WebCore/platform/Color.cpp b/WebCore/platform/Color.cpp
index 222737b142f7f4bdb78c443e68395cd82a101556..20faa847257475519be1ba23d29ce6d6a681f846 100644 (file)
--- a/WebCore/platform/Color.cpp
+++ b/WebCore/platform/Color.cpp
@@ -143,8 +143,8 @@ Color::Color(const char* name)
 String Color::name() const
 {
     if (alpha() < 0xFF)
-        return String::sprintf("#%02X%02X%02X%02X", red(), green(), blue(), alpha());
-    return String::sprintf("#%02X%02X%02X", red(), green(), blue());
+        return String::format("#%02X%02X%02X%02X", red(), green(), blue(), alpha());
+    return String::format("#%02X%02X%02X", red(), green(), blue());
 }
 
 void Color::setNamedColor(const String& name)

diff --git a/WebCore/platform/DeprecatedString.cpp b/WebCore/platform/DeprecatedString.cpp
index 2cb77eaf5b78461522c50b4f3fef8fb03f5e9c37..5738180c61200c608af1499d87fbd9beed1955ed 100644 (file)
--- a/WebCore/platform/DeprecatedString.cpp
+++ b/WebCore/platform/DeprecatedString.cpp
@@ -1736,41 +1736,43 @@ DeprecatedString &DeprecatedString::setLatin1(const char *str, int len)
 
 DeprecatedString &DeprecatedString::setNum(short n)
 {
-    return sprintf("%d", n);
+    return format("%d", n);
 }
 
 DeprecatedString &DeprecatedString::setNum(unsigned short n)
 {
-    return sprintf("%u", n);
+    return format("%u", n);
 }
 
 DeprecatedString &DeprecatedString::setNum(int n)
 {
-    return sprintf("%d", n);
+    return format("%d", n);
 }
 
 DeprecatedString &DeprecatedString::setNum(unsigned n)
 {
-    return sprintf("%u", n);
+    return format("%u", n);
 }
 
 DeprecatedString &DeprecatedString::setNum(long n)
 {
-    return sprintf("%ld", n);
+    return format("%ld", n);
 }
 
 DeprecatedString &DeprecatedString::setNum(unsigned long n)
 {
-    return sprintf("%lu", n);
+    return format("%lu", n);
 }
 
 DeprecatedString &DeprecatedString::setNum(double n)
 {
-    return sprintf("%.6lg", n);
+    return format("%.6lg", n);
 }
 
-DeprecatedString &DeprecatedString::sprintf(const char *format, ...)
+DeprecatedString &DeprecatedString::format(const char *format, ...)
 {
+    // FIXME: this needs the same windows compat fixes as String::format
+
     va_list args;
     va_start(args, format);
     

diff --git a/WebCore/platform/DeprecatedString.h b/WebCore/platform/DeprecatedString.h
index c7a15364402ec00ef6c9c203dbd3b8e01ead46b5..c9335a6bad8235c86c3397bbfe0d4b618e7e649d 100644 (file)
--- a/WebCore/platform/DeprecatedString.h
+++ b/WebCore/platform/DeprecatedString.h
@@ -348,7 +348,7 @@ public:
     DeprecatedString &setNum(unsigned long);
     DeprecatedString &setNum(double);
 
-    DeprecatedString &sprintf(const char *, ...) 
+    DeprecatedString& format(const char *, ...) 
 #if __GNUC__
     __attribute__ ((format (printf, 2, 3)))
 #endif

diff --git a/WebCore/platform/PlatformString.h b/WebCore/platform/PlatformString.h
index 642f2091d3df37c1b14f0cc6997619857c2358d2..850defe3d65a45fbea0a80462c97ac702ab2cbee 100644 (file)
--- a/WebCore/platform/PlatformString.h
+++ b/WebCore/platform/PlatformString.h
@@ -127,7 +127,7 @@ public:
     static String number(unsigned long long);
     static String number(double);
     
-    static String sprintf(const char *, ...)
+    static String format(const char *, ...)
 #if __GNUC__
         __attribute__ ((format (printf, 1, 2)))
 #endif

diff --git a/WebCore/platform/String.cpp b/WebCore/platform/String.cpp
index 251380d42950339dc9ea47d6ca5e316a5f3924d6..2f4fdd1be7ff926069fae711930769b0e754d96a 100644 (file)
--- a/WebCore/platform/String.cpp
+++ b/WebCore/platform/String.cpp
@@ -268,7 +268,7 @@ DeprecatedString String::deprecatedString() const
     return DeprecatedString(reinterpret_cast<const DeprecatedChar*>(m_impl->characters()), m_impl->length());
 }
 
-String String::sprintf(const char *format, ...)
+String String::format(const char *format, ...)
 {
     va_list args;
     va_start(args, format);
@@ -312,45 +312,45 @@ String String::sprintf(const char *format, ...)
 
 String String::number(int n)
 {
-    return String::sprintf("%d", n);
+    return String::format("%d", n);
 }
 
 String String::number(unsigned n)
 {
-    return String::sprintf("%u", n);
+    return String::format("%u", n);
 }
 
 String String::number(long n)
 {
-    return String::sprintf("%ld", n);
+    return String::format("%ld", n);
 }
 
 String String::number(unsigned long n)
 {
-    return String::sprintf("%lu", n);
+    return String::format("%lu", n);
 }
 
 String String::number(long long n)
 {
 #if PLATFORM(WIN_OS)
-    return String::sprintf("%I64i", n);
+    return String::format("%I64i", n);
 #else
-    return String::sprintf("%lli", n);
+    return String::format("%lli", n);
 #endif
 }
 
 String String::number(unsigned long long n)
 {
 #if PLATFORM(WIN_OS)
-    return String::sprintf("%I64u", n);
+    return String::format("%I64u", n);
 #else
-    return String::sprintf("%llu", n);
+    return String::format("%llu", n);
 #endif
 }
     
 String String::number(double n)
 {
-    return String::sprintf("%.6lg", n);
+    return String::format("%.6lg", n);
 }
 
 int String::toInt(bool* ok) const

diff --git a/WebCore/platform/mac/KeyEventMac.mm b/WebCore/platform/mac/KeyEventMac.mm
index 70af370b53816eea444539b8bbe96076ffe6505c..4a84e47c429a4d5706658552d7703fadb450a69b 100644 (file)
--- a/WebCore/platform/mac/KeyEventMac.mm
+++ b/WebCore/platform/mac/KeyEventMac.mm
@@ -322,7 +322,7 @@ static String keyIdentifierForKeyEvent(NSEvent* event)
             // FIXME: We should use something other than the vendor-area Unicode values for the above keys.
             // For now, just fall through to the default.
         default:
-            return String::sprintf("U+%06X", toupper(c));
+            return String::format("U+%06X", toupper(c));
     }
 }
 

diff --git a/WebCore/platform/win/KeyEventWin.cpp b/WebCore/platform/win/KeyEventWin.cpp
index c0da10a138a8d43fe5835186a7cc93ad996fa7fa..7838b8ca67a08c1e263fa5f77499c5ceb4bb1e95 100644 (file)
--- a/WebCore/platform/win/KeyEventWin.cpp
+++ b/WebCore/platform/win/KeyEventWin.cpp
@@ -130,7 +130,7 @@ static String keyIdentifierForWindowsKeyCode(short keyCode)
         case VK_DELETE:
             return "U+00007F";
         default:
-            return String::sprintf("U+%06X", toupper(keyCode));
+            return String::format("U+%06X", toupper(keyCode));
     }
 }
 

diff --git a/WebCore/rendering/RenderListMarker.cpp b/WebCore/rendering/RenderListMarker.cpp
index b89accecf477edb473be953aeedb8be739b1206f..cf5c1fd75052642f475a51ae77b47115951936cf 100644 (file)
--- a/WebCore/rendering/RenderListMarker.cpp
+++ b/WebCore/rendering/RenderListMarker.cpp
@@ -305,7 +305,7 @@ void RenderListMarker::calcMinMaxWidth()
     case DECIMAL_LEADING_ZERO:
         // ### unsupported, we use decimal instead
     case LDECIMAL:
-        m_item.sprintf("%d", m_listItem->value());
+        m_item.format("%d", m_listItem->value());
         break;
     case LOWER_ROMAN:
         m_item = toRoman(m_listItem->value(), false);

diff --git a/WebCore/rendering/RenderTreeAsText.cpp b/WebCore/rendering/RenderTreeAsText.cpp
index 3013b7ea3963451c5c3751a199a1836fa445ba2d..0472932a28ea6e03f01349a88ec46d991092b498 100644 (file)
--- a/WebCore/rendering/RenderTreeAsText.cpp
+++ b/WebCore/rendering/RenderTreeAsText.cpp
@@ -244,7 +244,7 @@ static String quoteAndEscapeNonPrintables(const String& s)
             else {
                 DeprecatedString hex;
                 unsigned u = c;
-                hex.sprintf("\\x{%X}", u);
+                hex.format("\\x{%X}", u);
                 result += hex;
             }
         }