summaryrefslogtreecommitdiff
path: root/lib/curl_rtmp.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2019-02-28 11:36:26 +0100
committerDaniel Stenberg <daniel@haxx.se>2019-02-28 20:47:48 +0100
commita5ae6bf50c54efb76a95b07f1acfa79c47913382 (patch)
treea64e657fbf04b097bbe84f993a7253ba6ba31d56 /lib/curl_rtmp.c
parent64d598d91d1b69305e17fcb0b7cde15f5a50aff2 (diff)
downloadcurl-bagder/simplify-bytecounters.tar.gz
urldata: simplify bytecountersbagder/simplify-bytecounters
- no need to have them protocol specific - no need to set pointers to them with the Curl_setup_transfer() call - make Curl_setup_transfer() operate on a transfer pointer, not connection - switch some counters from long to the more proper curl_off_t type Closes #3627
Diffstat (limited to 'lib/curl_rtmp.c')
-rw-r--r--lib/curl_rtmp.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
index f09f2f332..16b1de1ae 100644
--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 2012 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2012 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 2010, Howard Chu, <hyc@highlandsun.com>
*
* This software is licensed as described in the file COPYING, which
@@ -239,17 +239,18 @@ static CURLcode rtmp_connect(struct connectdata *conn, bool *done)
static CURLcode rtmp_do(struct connectdata *conn, bool *done)
{
+ struct Curl_easy *data = conn->data;
RTMP *r = conn->proto.generic;
if(!RTMP_ConnectStream(r, 0))
return CURLE_FAILED_INIT;
if(conn->data->set.upload) {
- Curl_pgrsSetUploadSize(conn->data, conn->data->state.infilesize);
- Curl_setup_transfer(conn, -1, -1, FALSE, NULL, FIRSTSOCKET, NULL);
+ Curl_pgrsSetUploadSize(data, data->state.infilesize);
+ Curl_setup_transfer(data, -1, -1, FALSE, FIRSTSOCKET);
}
else
- Curl_setup_transfer(conn, FIRSTSOCKET, -1, FALSE, NULL, -1, NULL);
+ Curl_setup_transfer(data, FIRSTSOCKET, -1, FALSE, -1);
*done = TRUE;
return CURLE_OK;
}