Hi Sean, On Mon, 12 Oct 2020, Sean McAllister wrote: > CURLOPT_FILE has been deprecated since 2003. To be precise, it has been aliased to `CURLOPT_WRITEDATA` in cURL v7.9.7: https://github.com/curl/curl/commit/980a47b42b95d7b9ff3378dc7b0f2e1c453fb649 The `CURLOPT_WRITEDATA` symbol became the preferred one only in v7.37.1 in 2014, though: https://github.com/curl/curl/commit/5fcef972b289bdc7f3dbd7a55a5ada0460b74b2d Ciao, Dscho > > Signed-off-by: Sean McAllister <smcallis@xxxxxxxxxx> > --- > http-push.c | 6 +++--- > http-walker.c | 2 +- > http.c | 6 +++--- > remote-curl.c | 4 ++-- > 4 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/http-push.c b/http-push.c > index 6a4a43e07f..2e6fee3305 100644 > --- a/http-push.c > +++ b/http-push.c > @@ -894,7 +894,7 @@ static struct remote_lock *lock_remote(const char *path, long timeout) > slot->results = &results; > curl_setup_http(slot->curl, url, DAV_LOCK, &out_buffer, fwrite_buffer); > curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); > - curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); > + curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &in_buffer); > > lock = xcalloc(1, sizeof(*lock)); > lock->timeout = -1; > @@ -1151,7 +1151,7 @@ static void remote_ls(const char *path, int flags, > curl_setup_http(slot->curl, url, DAV_PROPFIND, > &out_buffer, fwrite_buffer); > curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); > - curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); > + curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &in_buffer); > > if (start_active_slot(slot)) { > run_active_slot(slot); > @@ -1225,7 +1225,7 @@ static int locking_available(void) > curl_setup_http(slot->curl, repo->url, DAV_PROPFIND, > &out_buffer, fwrite_buffer); > curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); > - curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); > + curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &in_buffer); > > if (start_active_slot(slot)) { > run_active_slot(slot); > diff --git a/http-walker.c b/http-walker.c > index 4fb1235cd4..6c630711d1 100644 > --- a/http-walker.c > +++ b/http-walker.c > @@ -384,7 +384,7 @@ static void fetch_alternates(struct walker *walker, const char *base) > alt_req.walker = walker; > slot->callback_data = &alt_req; > > - curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer); > + curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &buffer); > curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); > curl_easy_setopt(slot->curl, CURLOPT_URL, url.buf); > > diff --git a/http.c b/http.c > index 8b23a546af..b3c1669388 100644 > --- a/http.c > +++ b/http.c > @@ -1921,7 +1921,7 @@ static int http_request(const char *url, > curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1); > } else { > curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0); > - curl_easy_setopt(slot->curl, CURLOPT_FILE, result); > + curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, result); > > if (target == HTTP_REQUEST_FILE) { > off_t posn = ftello(result); > @@ -2337,7 +2337,7 @@ struct http_pack_request *new_direct_http_pack_request( > } > > preq->slot = get_active_slot(); > - curl_easy_setopt(preq->slot->curl, CURLOPT_FILE, preq->packfile); > + curl_easy_setopt(preq->slot->curl, CURLOPT_WRITEDATA, preq->packfile); > curl_easy_setopt(preq->slot->curl, CURLOPT_WRITEFUNCTION, fwrite); > curl_easy_setopt(preq->slot->curl, CURLOPT_URL, preq->url); > curl_easy_setopt(preq->slot->curl, CURLOPT_HTTPHEADER, > @@ -2508,7 +2508,7 @@ struct http_object_request *new_http_object_request(const char *base_url, > > freq->slot = get_active_slot(); > > - curl_easy_setopt(freq->slot->curl, CURLOPT_FILE, freq); > + curl_easy_setopt(freq->slot->curl, CURLOPT_WRITEDATA, freq); > curl_easy_setopt(freq->slot->curl, CURLOPT_FAILONERROR, 0); > curl_easy_setopt(freq->slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file); > curl_easy_setopt(freq->slot->curl, CURLOPT_ERRORBUFFER, freq->errorstr); > diff --git a/remote-curl.c b/remote-curl.c > index 32cc4a0c55..7f44fa30fe 100644 > --- a/remote-curl.c > +++ b/remote-curl.c > @@ -847,7 +847,7 @@ static int probe_rpc(struct rpc_state *rpc, struct slot_results *results) > curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE, 4); > curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, headers); > curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); > - curl_easy_setopt(slot->curl, CURLOPT_FILE, &buf); > + curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &buf); > > err = run_slot(slot, results); > > @@ -1012,7 +1012,7 @@ static int post_rpc(struct rpc_state *rpc, int stateless_connect, int flush_rece > rpc_in_data.slot = slot; > rpc_in_data.check_pktline = stateless_connect; > memset(&rpc_in_data.pktline_state, 0, sizeof(rpc_in_data.pktline_state)); > - curl_easy_setopt(slot->curl, CURLOPT_FILE, &rpc_in_data); > + curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &rpc_in_data); > curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, 0); > > > -- > 2.28.0.1011.ga647a8990f-goog > >
