diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-05-05 16:53:05 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-05-05 16:53:05 +0200 |
| commit | 9c629e534866169b1445bd6614233ded73ff0460 (patch) | |
| tree | d495cda947b49582c084d766b9df71ba90e408f3 /lib/rtsp.c | |
| parent | f0612f166a5fa51d09498baa19a327c5cf36941f (diff) | |
| download | curl-9c629e534866169b1445bd6614233ded73ff0460.tar.gz | |
RTSP: cleanups
Made several functions static
Made one function defined to nothing when RTSP is disabled to avoid
the #ifdefs in code.
Removed explicit rtsp.h includes
Diffstat (limited to 'lib/rtsp.c')
| -rw-r--r-- | lib/rtsp.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/lib/rtsp.c b/lib/rtsp.c index 9e55f30c7..3ce8ad51e 100644 --- a/lib/rtsp.c +++ b/lib/rtsp.c @@ -59,6 +59,12 @@ #define RTP_PKT_LENGTH(p) ((((int)((unsigned char)((p)[2]))) << 8) | \ ((int)((unsigned char)((p)[3])))) +/* protocol-specific functions set up to be called by the main engine */ +static CURLcode rtsp_do(struct connectdata *conn, bool *done); +static CURLcode rtsp_done(struct connectdata *conn, CURLcode, bool premature); +static CURLcode rtsp_connect(struct connectdata *conn, bool *done); +static CURLcode rtsp_disconnect(struct connectdata *conn, bool dead); + static int rtsp_getsock_do(struct connectdata *conn, curl_socket_t *socks, int numsocks); @@ -99,16 +105,16 @@ CURLcode rtp_client_write(struct connectdata *conn, char *ptr, size_t len); const struct Curl_handler Curl_handler_rtsp = { "RTSP", /* scheme */ ZERO_NULL, /* setup_connection */ - Curl_rtsp, /* do_it */ - Curl_rtsp_done, /* done */ + rtsp_do, /* do_it */ + rtsp_done, /* done */ ZERO_NULL, /* do_more */ - Curl_rtsp_connect, /* connect_it */ + rtsp_connect, /* connect_it */ ZERO_NULL, /* connecting */ ZERO_NULL, /* doing */ ZERO_NULL, /* proto_getsock */ rtsp_getsock_do, /* doing_getsock */ ZERO_NULL, /* perform_getsock */ - Curl_rtsp_disconnect, /* disconnect */ + rtsp_disconnect, /* disconnect */ rtsp_rtp_readwrite, /* readwrite */ PORT_RTSP, /* defport */ CURLPROTO_RTSP, /* protocol */ @@ -148,7 +154,7 @@ bool Curl_rtsp_connisdead(struct connectdata *check) return ret_val; } -CURLcode Curl_rtsp_connect(struct connectdata *conn, bool *done) +static CURLcode rtsp_connect(struct connectdata *conn, bool *done) { CURLcode httpStatus; struct SessionHandle *data = conn->data; @@ -166,16 +172,16 @@ CURLcode Curl_rtsp_connect(struct connectdata *conn, bool *done) return httpStatus; } -CURLcode Curl_rtsp_disconnect(struct connectdata *conn, bool dead_connection) +static CURLcode rtsp_disconnect(struct connectdata *conn, bool dead) { - (void) dead_connection; + (void) dead; Curl_safefree(conn->proto.rtspc.rtp_buf); return CURLE_OK; } -CURLcode Curl_rtsp_done(struct connectdata *conn, - CURLcode status, bool premature) +static CURLcode rtsp_done(struct connectdata *conn, + CURLcode status, bool premature) { struct SessionHandle *data = conn->data; struct RTSP *rtsp = data->state.proto.rtsp; @@ -209,7 +215,7 @@ CURLcode Curl_rtsp_done(struct connectdata *conn, return httpStatus; } -CURLcode Curl_rtsp(struct connectdata *conn, bool *done) +static CURLcode rtsp_do(struct connectdata *conn, bool *done) { struct SessionHandle *data = conn->data; CURLcode result=CURLE_OK; |