[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 510d7c1e7f51b2a5396e848772f53ea838f8c9eb
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 19:33:16 2010 +0000

    2010-09-29  João Paulo Rechi Vita  <jprvita at profusion.mobi>
    
            Reviewed by Antonio Gomes.
    
            [Curl] Fix unused and unitialized warnings.
            https://bugs.webkit.org/show_bug.cgi?id=46831
    
            No new tests since no new funcionality has been added.
    
            * platform/network/curl/ResourceHandleCurl.cpp:
            (WebCore::allowsAnyHTTPSCertificateHosts):
            * platform/network/curl/ResourceHandleManager.cpp:
            (WebCore::ResourceHandleManager::ResourceHandleManager):
            (WebCore::handleLocalReceiveResponse):
            (WebCore::ResourceHandleManager::downloadTimerCallback):
            (WebCore::ResourceHandleManager::initializeHandle):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68679 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 49f0364..f64a77d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-09-29  João Paulo Rechi Vita  <jprvita at profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [Curl] Fix unused and unitialized warnings.
+        https://bugs.webkit.org/show_bug.cgi?id=46831
+
+        No new tests since no new funcionality has been added.
+
+        * platform/network/curl/ResourceHandleCurl.cpp:
+        (WebCore::allowsAnyHTTPSCertificateHosts):
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::ResourceHandleManager::ResourceHandleManager):
+        (WebCore::handleLocalReceiveResponse):
+        (WebCore::ResourceHandleManager::downloadTimerCallback):
+        (WebCore::ResourceHandleManager::initializeHandle):
+
 2010-09-29  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/platform/network/curl/ResourceHandleCurl.cpp b/WebCore/platform/network/curl/ResourceHandleCurl.cpp
index 052ac56..f360f86 100644
--- a/WebCore/platform/network/curl/ResourceHandleCurl.cpp
+++ b/WebCore/platform/network/curl/ResourceHandleCurl.cpp
@@ -83,14 +83,6 @@ void WebCoreSynchronousLoader::didFail(ResourceHandle*, const ResourceError& err
     m_error = error;
 }
 
-
-static HashSet<String>& allowsAnyHTTPSCertificateHosts()
-{
-    static HashSet<String> hosts;
-
-    return hosts;
-}
-
 ResourceHandleInternal::~ResourceHandleInternal()
 {
     fastFree(m_url);
@@ -133,6 +125,13 @@ bool ResourceHandle::supportsBufferedData()
 }
 
 #if PLATFORM(WIN) && PLATFORM(CF)
+static HashSet<String>& allowsAnyHTTPSCertificateHosts()
+{
+    static HashSet<String> hosts;
+
+    return hosts;
+}
+
 void ResourceHandle::setHostAllowsAnyHTTPSCertificate(const String& host)
 {
     allowsAnyHTTPSCertificateHosts().add(host.lower());
diff --git a/WebCore/platform/network/curl/ResourceHandleManager.cpp b/WebCore/platform/network/curl/ResourceHandleManager.cpp
index a4d71e0..2cc87ae 100644
--- a/WebCore/platform/network/curl/ResourceHandleManager.cpp
+++ b/WebCore/platform/network/curl/ResourceHandleManager.cpp
@@ -121,8 +121,9 @@ static void curl_unlock_callback(CURL* handle, curl_lock_data data, void* userPt
 ResourceHandleManager::ResourceHandleManager()
     : m_downloadTimer(this, &ResourceHandleManager::downloadTimerCallback)
     , m_cookieJarFileName(0)
-    , m_runningJobs(0)
     , m_certificatePath (certificatePath())
+    , m_runningJobs(0)
+
 {
     curl_global_init(CURL_GLOBAL_ALL);
     m_curlMultiHandle = curl_multi_init();
@@ -164,7 +165,7 @@ static void handleLocalReceiveResponse (CURL* handle, ResourceHandle* job, Resou
     // TODO: See if there is a better approach for handling this.
      const char* hdr;
      CURLcode err = curl_easy_getinfo(handle, CURLINFO_EFFECTIVE_URL, &hdr);
-     ASSERT(CURLE_OK == err);
+     ASSERT_UNUSED(err, CURLE_OK == err);
      d->m_response.setURL(KURL(ParsedURLString, hdr));
      if (d->client())
          d->client()->didReceiveResponse(job, d->m_response);
@@ -372,7 +373,7 @@ void ResourceHandleManager::downloadTimerCallback(Timer<ResourceHandleManager>*
         ASSERT(handle);
         ResourceHandle* job = 0;
         CURLcode err = curl_easy_getinfo(handle, CURLINFO_PRIVATE, &job);
-        ASSERT(CURLE_OK == err);
+        ASSERT_UNUSED(err, CURLE_OK == err);
         ASSERT(job);
         if (!job)
             continue;
@@ -711,7 +712,7 @@ void ResourceHandleManager::initializeHandle(ResourceHandle* job)
         CURLcode error = curl_easy_pause(d->m_handle, CURLPAUSE_ALL);
         // If we did not pause the handle, we would ASSERT in the
         // header callback. So just assert here.
-        ASSERT(error == CURLE_OK);
+        ASSERT_UNUSED(error, error == CURLE_OK);
     }
 #endif
 #ifndef NDEBUG

-- 
WebKit Debian packaging