Changeset 152087 in webkit

Timestamp:

Jun 27, 2013, 3:28:07 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[curl] Fix unused variable/parameter warnings
​https://bugs.webkit.org/show_bug.cgi?id=118050

Patch by Peter Gal <​galpeter@inf.u-szeged.hu> on 2013-06-27
Reviewed by Christophe Dumez.

Commented out unused parameters and removed an unused variable in the curl backend.

No tests required.

• platform/network/curl/CredentialStorageCurl.cpp:

(WebCore::CredentialStorage::getFromPersistentStorage):

• platform/network/curl/DNSCurl.cpp:

(WebCore::prefetchDNS):

• platform/network/curl/ResourceHandleManager.cpp:

(WebCore::curl_lock_callback):
(WebCore::curl_unlock_callback):
(WebCore::headerCallback):
(WebCore::ResourceHandleManager::downloadTimerCallback):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/CredentialStorageCurl.cpp (modified) (1 diff)
• platform/network/curl/DNSCurl.cpp (modified) (1 diff)
• platform/network/curl/ResourceHandleManager.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-27  Peter Gal  <galpeter@inf.u-szeged.hu>
+
+        [curl] Fix unused variable/parameter warnings
+        https://bugs.webkit.org/show_bug.cgi?id=118050
+
+        Reviewed by Christophe Dumez.
+
+        Commented out unused parameters and removed an unused variable in the curl backend.
+
+        No tests required.
+
+        * platform/network/curl/CredentialStorageCurl.cpp:
+        (WebCore::CredentialStorage::getFromPersistentStorage):
+        * platform/network/curl/DNSCurl.cpp:
+        (WebCore::prefetchDNS):
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::curl_lock_callback):
+        (WebCore::curl_unlock_callback):
+        (WebCore::headerCallback):
+        (WebCore::ResourceHandleManager::downloadTimerCallback):
+
 2013-06-27  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/platform/network/curl/CredentialStorageCurl.cpp

@@ -32 +32 @@
 namespace WebCore {
 
-Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace& protectionSpace)
+Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace& /* protectionSpace */)
 {
     notImplemented();

trunk/Source/WebCore/platform/network/curl/DNSCurl.cpp

@@ -31 +31 @@
 namespace WebCore {
 
-void prefetchDNS(const String& hostname)
+void prefetchDNS(const String& /* hostname */)
 {
     notImplemented();

trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp

@@ -116 +116 @@
 // these two functions provide mutexes for cookies, and for the global DNS
 // cache.
-static void curl_lock_callback(CURL* handle, curl_lock_data data, curl_lock_access access, void* userPtr)
+static void curl_lock_callback(CURL* /* handle */, curl_lock_data data, curl_lock_access /* access */, void* /* userPtr */)
 {
     if (Mutex* mutex = sharedResourceMutex(data))
@@ -122 +122 @@
 }
 
-static void curl_unlock_callback(CURL* handle, curl_lock_data data, void* userPtr)
+static void curl_unlock_callback(CURL* /* handle */, curl_lock_data data, void* /* userPtr */)
 {
     if (Mutex* mutex = sharedResourceMutex(data))
@@ -313 +313 @@
     if (header == String("\r\n") || header == String("\n")) {
         CURL* h = d->m_handle;
-        CURLcode err;
 
         long httpCode = 0;
-        err = curl_easy_getinfo(h, CURLINFO_RESPONSE_CODE, &httpCode);
+        curl_easy_getinfo(h, CURLINFO_RESPONSE_CODE, &httpCode);
 
         if (isHttpInfo(httpCode)) {
@@ -325 +324 @@
 
         double contentLength = 0;
-        err = curl_easy_getinfo(h, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &contentLength);
+        curl_easy_getinfo(h, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &contentLength);
         d->m_response.setExpectedContentLength(static_cast<long long int>(contentLength));
 
         const char* hdr;
-        err = curl_easy_getinfo(h, CURLINFO_EFFECTIVE_URL, &hdr);
+        curl_easy_getinfo(h, CURLINFO_EFFECTIVE_URL, &hdr);
         d->m_response.setURL(KURL(ParsedURLString, hdr));
 
@@ -423 +422 @@
 }
 
-void ResourceHandleManager::downloadTimerCallback(Timer<ResourceHandleManager>* timer)
+void ResourceHandleManager::downloadTimerCallback(Timer<ResourceHandleManager>* /* timer */)
 {
     startScheduledJobs();