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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 33c95b1655f89f0e4088ee87097f6d0ec3ec6ede
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 11 19:00:36 2003 +0000

            Reviewed by me
    
            * kwq/KWQLoader.mm:
            (KWQCacheObjectExpiresTime): Fixed deployment build bustage.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5762 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index cd11eea..6eacab4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2003-12-11  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by me
+
+        * kwq/KWQLoader.mm:
+        (KWQCacheObjectExpiresTime): Fixed deployment build bustage.
+
 2003-12-09  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Darin
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index c2bb7fc..7f68816 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -298,17 +298,15 @@ void *KWQResponseHeaderString(void *response)
 
 time_t KWQCacheObjectExpiresTime(khtml::DocLoader *docLoader, void *response)
 {
-    time_t result = 0;
-
     KWQ_BLOCK_EXCEPTIONS;
     
     KWQKHTMLPart *part = static_cast<KWQKHTMLPart *>(docLoader->part());
     WebCoreBridge *bridge = part->bridge();
-    result = [bridge expiresTimeForResponse:(NSURLResponse *)response];
+    return [bridge expiresTimeForResponse:(NSURLResponse *)response];
     
     KWQ_UNBLOCK_EXCEPTIONS;
     
-    return result;
+    return 0;
 }
 
 KWQLoader::KWQLoader(Loader *loader)

-- 
WebKit Debian packaging