generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtmp: Use standard naming for setup connection function

Browse Source 
Renamed rtmp_setup() to rtmp_setup_connection() to follow more widely
used function naming.
This commit is contained in:
Steve Holme
2014-12-24 17:12:13 +00:00
parent 93e6273b68
commit ce2a80b482
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/curl_rtmp.c
View File

@@ -49,7 +49,7 @@
#define DEF_BUFTIME (2*60*60*1000) /* 2 hours */ #define DEF_BUFTIME (2*60*60*1000) /* 2 hours */
static CURLcode rtmp_setup(struct connectdata *conn); static CURLcode rtmp_setup_connection(struct connectdata *conn);
static CURLcode rtmp_do(struct connectdata *conn, bool *done); static CURLcode rtmp_do(struct connectdata *conn, bool *done);
static CURLcode rtmp_done(struct connectdata *conn, CURLcode, bool premature); static CURLcode rtmp_done(struct connectdata *conn, CURLcode, bool premature);
static CURLcode rtmp_connect(struct connectdata *conn, bool *done); static CURLcode rtmp_connect(struct connectdata *conn, bool *done);
@@ -64,7 +64,7 @@ static Curl_send rtmp_send;
const struct Curl_handler Curl_handler_rtmp = { const struct Curl_handler Curl_handler_rtmp = {
"RTMP", /* scheme */ "RTMP", /* scheme */
rtmp_setup, /* setup_connection */ rtmp_setup_connection, /* setup_connection */
rtmp_do, /* do_it */ rtmp_do, /* do_it */
rtmp_done, /* done */ rtmp_done, /* done */
ZERO_NULL, /* do_more */ ZERO_NULL, /* do_more */
@@ -84,7 +84,7 @@ const struct Curl_handler Curl_handler_rtmp = {
const struct Curl_handler Curl_handler_rtmpt = { const struct Curl_handler Curl_handler_rtmpt = {
"RTMPT", /* scheme */ "RTMPT", /* scheme */
rtmp_setup, /* setup_connection */ rtmp_setup_connection, /* setup_connection */
rtmp_do, /* do_it */ rtmp_do, /* do_it */
rtmp_done, /* done */ rtmp_done, /* done */
ZERO_NULL, /* do_more */ ZERO_NULL, /* do_more */
@@ -104,7 +104,7 @@ const struct Curl_handler Curl_handler_rtmpt = {
const struct Curl_handler Curl_handler_rtmpe = { const struct Curl_handler Curl_handler_rtmpe = {
"RTMPE", /* scheme */ "RTMPE", /* scheme */
rtmp_setup, /* setup_connection */ rtmp_setup_connection, /* setup_connection */
rtmp_do, /* do_it */ rtmp_do, /* do_it */
rtmp_done, /* done */ rtmp_done, /* done */
ZERO_NULL, /* do_more */ ZERO_NULL, /* do_more */
@@ -124,7 +124,7 @@ const struct Curl_handler Curl_handler_rtmpe = {
const struct Curl_handler Curl_handler_rtmpte = { const struct Curl_handler Curl_handler_rtmpte = {
"RTMPTE", /* scheme */ "RTMPTE", /* scheme */
rtmp_setup, /* setup_connection */ rtmp_setup_connection, /* setup_connection */
rtmp_do, /* do_it */ rtmp_do, /* do_it */
rtmp_done, /* done */ rtmp_done, /* done */
ZERO_NULL, /* do_more */ ZERO_NULL, /* do_more */
@@ -144,7 +144,7 @@ const struct Curl_handler Curl_handler_rtmpte = {
const struct Curl_handler Curl_handler_rtmps = { const struct Curl_handler Curl_handler_rtmps = {
"RTMPS", /* scheme */ "RTMPS", /* scheme */
rtmp_setup, /* setup_connection */ rtmp_setup_connection, /* setup_connection */
rtmp_do, /* do_it */ rtmp_do, /* do_it */
rtmp_done, /* done */ rtmp_done, /* done */
ZERO_NULL, /* do_more */ ZERO_NULL, /* do_more */
@@ -164,7 +164,7 @@ const struct Curl_handler Curl_handler_rtmps = {
const struct Curl_handler Curl_handler_rtmpts = { const struct Curl_handler Curl_handler_rtmpts = {
"RTMPTS", /* scheme */ "RTMPTS", /* scheme */
rtmp_setup, /* setup_connection */ rtmp_setup_connection, /* setup_connection */
rtmp_do, /* do_it */ rtmp_do, /* do_it */
rtmp_done, /* done */ rtmp_done, /* done */
ZERO_NULL, /* do_more */ ZERO_NULL, /* do_more */
@@ -182,10 +182,9 @@ const struct Curl_handler Curl_handler_rtmpts = {
PROTOPT_NONE /* flags*/ PROTOPT_NONE /* flags*/
}; };
static CURLcode rtmp_setup(struct connectdata *conn) static CURLcode rtmp_setup_connection(struct connectdata *conn)
{ {
RTMP *r = RTMP_Alloc(); RTMP *r = RTMP_Alloc();
if(!r) if(!r)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;