core.git: ucb/source

[Stephan Bergmann (via logerrit)]

 ucb/source/ucp/webdav-curl/CurlSession.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 7e464f04014f820f3e935708de432205a7507b1e
Author:     Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Mon Aug 5 12:31:38 2024 +0200
Commit:     Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Mon Aug 5 21:21:36 2024 +0200

    Fix CURLSHOPT_UNLOCKFUNC function signature
    
    (cf. <https://curl.se/libcurl/c/CURLSHOPT_UNLOCKFUNC.html>; I noticed this 
with
    an experimental Emscripten --enable-curl --with-webdav build that failed 
with a
    "RuntimeError: null function or function signature mismatch" during the 
call to
    
    >     rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_SHARE, 
g_Init.pShare.get());
    
    in the CurlSession ctor)
    
    Change-Id: Iec4bd5a263484e2e615d0b7bb08928feb7dc4658
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171487
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>

diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx 
b/ucb/source/ucp/webdav-curl/CurlSession.cxx
index 9976bda67c01..6eb3e3f2c41e 100644
--- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
+++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
@@ -54,7 +54,7 @@ using namespace ::com::sun::star;
 namespace
 {
 void lock_cb(CURL*, curl_lock_data, curl_lock_access, void*);
-void unlock_cb(CURL*, curl_lock_data, curl_lock_access, void*);
+void unlock_cb(CURL*, curl_lock_data, void*);
 
 /// globals container
 struct Init
@@ -126,8 +126,7 @@ void lock_cb(CURL* /*handle*/, curl_lock_data const data, 
curl_lock_access /*acc
     }
 }
 
-void unlock_cb(CURL* /*handle*/, curl_lock_data const data, curl_lock_access 
/*access*/,
-               void* /*userptr*/)
+void unlock_cb(CURL* /*handle*/, curl_lock_data const data, void* /*userptr*/)
 {
     assert(0 <= data && data < CURL_LOCK_DATA_LAST);
     g_Init.ShareLock[data].unlock();