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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 2c739c15cb6dcf3d9524aa591d31d2801c7fe3cb
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 18 23:09:33 2002 +0000

    Fix NULL case.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@776 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index b745054..8d37337 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
 2002-03-18  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQString.mm: (QString::latin1): Handle null case properly.
+	We must return "", not 0.
+
+2002-03-18  Darin Adler  <darin at apple.com>
+
         Redo inlining of QChar and QString and some other small speed improvements.
         Sadly, this doesn't seem to make things measurably faster, but I decided to
         commit my work rather than discarding it; it doesn't make things slower.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b745054..8d37337 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
 2002-03-18  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQString.mm: (QString::latin1): Handle null case properly.
+	We must return "", not 0.
+
+2002-03-18  Darin Adler  <darin at apple.com>
+
         Redo inlining of QChar and QString and some other small speed improvements.
         Sadly, this doesn't seem to make things measurably faster, but I decided to
         commit my work rather than discarding it; it doesn't make things slower.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b745054..8d37337 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2002-03-18  Darin Adler  <darin at apple.com>
 
+	* src/kwq/KWQString.mm: (QString::latin1): Handle null case properly.
+	We must return "", not 0.
+
+2002-03-18  Darin Adler  <darin at apple.com>
+
         Redo inlining of QChar and QString and some other small speed improvements.
         Sadly, this doesn't seem to make things measurably faster, but I decided to
         commit my work rather than discarding it; it doesn't make things slower.
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index d619a93..ac25df6 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -366,7 +366,7 @@ const char *QString::latin1() const
             uint len = length();
             if (len == 0) {
                 cacheType = CacheLatin1;
-                cache = isNull() ? 0 : const_cast<char *>("");
+                cache = const_cast<char *>("");
             } else {
                 cacheType = CacheAllocatedLatin1;
                 cache = CFAllocatorAllocate(kCFAllocatorDefault, len + 1, 0);
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index d619a93..ac25df6 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -366,7 +366,7 @@ const char *QString::latin1() const
             uint len = length();
             if (len == 0) {
                 cacheType = CacheLatin1;
-                cache = isNull() ? 0 : const_cast<char *>("");
+                cache = const_cast<char *>("");
             } else {
                 cacheType = CacheAllocatedLatin1;
                 cache = CFAllocatorAllocate(kCFAllocatorDefault, len + 1, 0);

-- 
WebKit Debian packaging