[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[gramps]

The following commit has been merged in the debian/unstable branch:
commit fe402492836138bb7484b7c97385fd089aade072
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 5 16:14:14 2001 +0000

    Implemented sprintf
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@283 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index ca58706..893c2a3 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -942,12 +942,33 @@ QString &QString::setNum(int n)
     return *this;
 }
 
-QString &QString::sprintf(const char *, ...)
+QString &QString::sprintf(const char *format, ...)
 {
+    va_list args;
+    va_start(args, format);
     flushCache();
-    // FIXME: not yet implemented
-    NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
-            __LINE__);
+    if (format && *format) {
+        if (!s) {
+            s = CFStringCreateMutable(kCFAllocatorDefault, 0);
+        }
+        if (s) {
+            CFStringRef f = CFStringCreateWithCStringNoCopy(kCFAllocatorDefault,
+                    format, kCFStringEncodingISOLatin1, kCFAllocatorDefault);
+            if (f) {
+                CFStringRef tmp = CFStringCreateWithFormatAndArguments(
+                        kCFAllocatorDefault, NULL, f, args);
+                if (tmp) {
+                    CFStringReplaceAll(s, tmp);
+                    CFRelease(tmp);
+                }
+                CFRelease(f);
+            }
+        }
+    } else if (s) {
+        CFRelease(s);
+        s = NULL;
+    }
+    va_end(args);
     return *this;
 }
 
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index ca58706..893c2a3 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -942,12 +942,33 @@ QString &QString::setNum(int n)
     return *this;
 }
 
-QString &QString::sprintf(const char *, ...)
+QString &QString::sprintf(const char *format, ...)
 {
+    va_list args;
+    va_start(args, format);
     flushCache();
-    // FIXME: not yet implemented
-    NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
-            __LINE__);
+    if (format && *format) {
+        if (!s) {
+            s = CFStringCreateMutable(kCFAllocatorDefault, 0);
+        }
+        if (s) {
+            CFStringRef f = CFStringCreateWithCStringNoCopy(kCFAllocatorDefault,
+                    format, kCFStringEncodingISOLatin1, kCFAllocatorDefault);
+            if (f) {
+                CFStringRef tmp = CFStringCreateWithFormatAndArguments(
+                        kCFAllocatorDefault, NULL, f, args);
+                if (tmp) {
+                    CFStringReplaceAll(s, tmp);
+                    CFRelease(tmp);
+                }
+                CFRelease(f);
+            }
+        }
+    } else if (s) {
+        CFRelease(s);
+        s = NULL;
+    }
+    va_end(args);
     return *this;
 }
 

-- 
WebKit Debian packaging