[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 84cc2b5334c2e92cbc80122f18b120546333d04e
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 28 18:18:16 2001 +0000

    Added a little more error checking
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@219 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQChar.mm b/WebCore/kwq/KWQChar.mm
index a9b0c7a..8fa1c45 100644
--- a/WebCore/kwq/KWQChar.mm
+++ b/WebCore/kwq/KWQChar.mm
@@ -43,6 +43,8 @@ static CFMutableStringRef GetScratchUniCharString()
     return s;
 }
 
+// constructors, copy constructors, and destructors ----------------------------
+
 QChar::QChar()
 {
     c = 0;
@@ -88,6 +90,8 @@ QChar::~QChar()
     // do nothing because the single data member is a UniChar
 }
 
+// member functions ------------------------------------------------------------
+
 ushort QChar::unicode() const
 {
     return c;
@@ -158,20 +162,26 @@ bool QChar::isPunct() const
 
 QChar QChar::lower() const
 {
-    scratchUniChar = c;
-    CFStringLowercase(GetScratchUniCharString(), NULL);
-    if (scratchUniChar) {
-	return QChar(scratchUniChar);
+    CFMutableStringRef scratchUniCharString = GetScratchUniCharString();
+    if (scratchUniCharString) {
+        scratchUniChar = c;
+        CFStringLowercase(scratchUniCharString, NULL);
+        if (scratchUniChar) {
+            return QChar(scratchUniChar);
+        }
     }
     return *this;
 }
 
 QChar QChar::upper() const
 {
-    scratchUniChar = c;
-    CFStringUppercase(GetScratchUniCharString(), NULL);
-    if (scratchUniChar) {
-	return QChar(scratchUniChar);
+    CFMutableStringRef scratchUniCharString = GetScratchUniCharString();
+    if (scratchUniCharString) {
+        scratchUniChar = c;
+        CFStringUppercase(scratchUniCharString, NULL);
+        if (scratchUniChar) {
+            return QChar(scratchUniChar);
+        }
     }
     return *this;
 }
@@ -197,6 +207,8 @@ QChar QChar::mirroredChar() const
     return *this;
 }
 
+// operators -------------------------------------------------------------------
+
 int operator==(QChar qc1, QChar qc2)
 {
     return qc1.c == qc2.c;
diff --git a/WebCore/src/kwq/KWQChar.mm b/WebCore/src/kwq/KWQChar.mm
index a9b0c7a..8fa1c45 100644
--- a/WebCore/src/kwq/KWQChar.mm
+++ b/WebCore/src/kwq/KWQChar.mm
@@ -43,6 +43,8 @@ static CFMutableStringRef GetScratchUniCharString()
     return s;
 }
 
+// constructors, copy constructors, and destructors ----------------------------
+
 QChar::QChar()
 {
     c = 0;
@@ -88,6 +90,8 @@ QChar::~QChar()
     // do nothing because the single data member is a UniChar
 }
 
+// member functions ------------------------------------------------------------
+
 ushort QChar::unicode() const
 {
     return c;
@@ -158,20 +162,26 @@ bool QChar::isPunct() const
 
 QChar QChar::lower() const
 {
-    scratchUniChar = c;
-    CFStringLowercase(GetScratchUniCharString(), NULL);
-    if (scratchUniChar) {
-	return QChar(scratchUniChar);
+    CFMutableStringRef scratchUniCharString = GetScratchUniCharString();
+    if (scratchUniCharString) {
+        scratchUniChar = c;
+        CFStringLowercase(scratchUniCharString, NULL);
+        if (scratchUniChar) {
+            return QChar(scratchUniChar);
+        }
     }
     return *this;
 }
 
 QChar QChar::upper() const
 {
-    scratchUniChar = c;
-    CFStringUppercase(GetScratchUniCharString(), NULL);
-    if (scratchUniChar) {
-	return QChar(scratchUniChar);
+    CFMutableStringRef scratchUniCharString = GetScratchUniCharString();
+    if (scratchUniCharString) {
+        scratchUniChar = c;
+        CFStringUppercase(scratchUniCharString, NULL);
+        if (scratchUniChar) {
+            return QChar(scratchUniChar);
+        }
     }
     return *this;
 }
@@ -197,6 +207,8 @@ QChar QChar::mirroredChar() const
     return *this;
 }
 
+// operators -------------------------------------------------------------------
+
 int operator==(QChar qc1, QChar qc2)
 {
     return qc1.c == qc2.c;

-- 
WebKit Debian packaging