Changeset 276211 in webkit

Timestamp:

Apr 17, 2021, 3:55:14 PM (5 years ago)

Author:

basuke.suzuki@sony.com

Message:

[Curl] Remove warnings on curl layer.
​https://bugs.webkit.org/show_bug.cgi?id=224721

Reviewed by Darin Adler.

Remove unused parameters to prevent warnings. For CurlRequest, it passes
member variable to private method which is meaningless so that it was
removed.

Covered by existing test files.

• platform/network/curl/CookieJarDB.cpp:

(WebCore::CookieJarDB::createPrepareStatement):

• platform/network/curl/CurlFormDataStream.cpp:

(WebCore::CurlFormDataStream::read):

• platform/network/curl/CurlRequest.cpp:

(WebCore::CurlRequest::setupTransfer):
(WebCore::CurlRequest::setupPUT):
(WebCore::CurlRequest::setupPOST):

• platform/network/curl/CurlRequest.h:
• platform/network/curl/NetworkStorageSessionCurl.cpp:

(WebCore::NetworkStorageSession::setCookiesFromDOM const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/CookieJarDB.cpp (modified) (1 diff)
• platform/network/curl/CurlFormDataStream.cpp (modified) (1 diff)
• platform/network/curl/CurlRequest.cpp (modified) (3 diffs)
• platform/network/curl/CurlRequest.h (modified) (1 diff)
• platform/network/curl/NetworkStorageSessionCurl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-17  Basuke Suzuki  <basuke.suzuki@sony.com>
+
+        [Curl] Remove warnings on curl layer.
+        https://bugs.webkit.org/show_bug.cgi?id=224721
+
+        Reviewed by Darin Adler.
+
+        Remove unused parameters to prevent warnings. For CurlRequest, it passes
+        member variable to private method which is meaningless so that it was
+        removed.
+
+        Covered by existing test files.
+
+        * platform/network/curl/CookieJarDB.cpp:
+        (WebCore::CookieJarDB::createPrepareStatement):
+        * platform/network/curl/CurlFormDataStream.cpp:
+        (WebCore::CurlFormDataStream::read):
+        * platform/network/curl/CurlRequest.cpp:
+        (WebCore::CurlRequest::setupTransfer):
+        (WebCore::CurlRequest::setupPUT):
+        (WebCore::CurlRequest::setupPOST):
+        * platform/network/curl/CurlRequest.h:
+        * platform/network/curl/NetworkStorageSessionCurl.cpp:
+        (WebCore::NetworkStorageSession::setCookiesFromDOM const):
+
 2021-04-17  Chris Lord  <clord@igalia.com>
 

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

@@ -640 +640 @@
     auto statement = makeUnique<SQLiteStatement>(m_database, sql);
     int ret = statement->prepare();
-    ASSERT(ret == SQLITE_OK);
+    ASSERT_UNUSED(ret, ret == SQLITE_OK);
     m_statements.add(sql, WTFMove(statement));
 }

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

@@ -129 +129 @@
             }, [&] (const FormDataElement::EncodedFileData& fileData) {
                 return readFromFile(fileData, bufferPosition, bufferSize);
-            }, [] (const FormDataElement::EncodedBlobData& blobData) {
+            }, [] (const FormDataElement::EncodedBlobData&) {
                 ASSERT_NOT_REACHED();
                 return WTF::nullopt;

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

@@ -217 +217 @@
         m_curlHandle->enableHttpGetRequest();
     else if (method == "POST")
-        setupPOST(m_request);
+        setupPOST();
     else if (method == "PUT")
-        setupPUT(m_request);
+        setupPUT();
     else if (method == "HEAD")
         m_curlHandle->enableHttpHeadRequest();
     else {
         m_curlHandle->setHttpCustomRequest(method);
-        setupPUT(m_request);
+        setupPUT();
     }
 
@@ -530 +530 @@
 }
 
-void CurlRequest::setupPUT(ResourceRequest& request)
+void CurlRequest::setupPUT()
 {
     m_curlHandle->enableHttpPutRequest();
@@ -544 +544 @@
 }
 
-void CurlRequest::setupPOST(ResourceRequest& request)
+void CurlRequest::setupPOST()
 {
     m_curlHandle->enableHttpPostRequest();

trunk/Source/WebCore/platform/network/curl/CurlRequest.h

@@ -136 +136 @@
     // For setup 
     void appendAcceptLanguageHeader(HTTPHeaderMap&);
-    void setupPOST(ResourceRequest&);
-    void setupPUT(ResourceRequest&);
+    void setupPOST();
+    void setupPUT();
     void setupSendData(bool forPutMethod);
 

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

@@ -96 +96 @@
 }
 
-void NetworkStorageSession::setCookiesFromDOM(const URL& firstParty, const SameSiteInfo&, const URL& url, Optional<FrameIdentifier> frameID, Optional<PageIdentifier> pageID, ShouldAskITP, const String& value, ShouldRelaxThirdPartyCookieBlocking shouldRelaxThirdPartyCookieBlocking) const
+void NetworkStorageSession::setCookiesFromDOM(const URL& firstParty, const SameSiteInfo&, const URL& url, Optional<FrameIdentifier>, Optional<PageIdentifier> pageID, ShouldAskITP, const String& value, ShouldRelaxThirdPartyCookieBlocking) const
 {
 #if ENABLE(RESOURCE_LOAD_STATISTICS)
     Optional<Seconds> cappedLifetime = clientSideCookieCap(RegistrableDomain { firstParty }, pageID);
 #else
+    UNUSED_PARAM(pageID);
     Optional<Seconds> cappedLifetime = WTF::nullopt;
 #endif