Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 9c629e534866169b1445bd6614233ded73ff0460 1 parent f0612f1
Daniel Stenberg authored
4 lib/http.c
View
@@ -96,7 +96,6 @@
#include "multiif.h"
#include "rawstr.h"
#include "content_encoding.h"
-#include "rtsp.h"
#include "http_proxy.h"
#include "warnless.h"
#include "non-ascii.h"
@@ -3314,13 +3313,12 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data,
}
}
}
-#ifndef CURL_DISABLE_RTSP
else if(conn->handler->protocol & CURLPROTO_RTSP) {
result = Curl_rtsp_parseheader(conn, k->p);
if(result)
return result;
}
-#endif
+
/*
* End of header-checks. Write them to the client.
*/
26 lib/rtsp.c
View
@@ -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;
9 lib/rtsp.h
View
@@ -26,17 +26,12 @@
extern const struct Curl_handler Curl_handler_rtsp;
-/* protocol-specific functions set up to be called by the main engine */
-CURLcode Curl_rtsp(struct connectdata *conn, bool *done);
-CURLcode Curl_rtsp_done(struct connectdata *conn, CURLcode, bool premature);
-CURLcode Curl_rtsp_connect(struct connectdata *conn, bool *done);
-CURLcode Curl_rtsp_disconnect(struct connectdata *conn, bool dead_connection);
-
-CURLcode Curl_rtsp_parseheader(struct connectdata *conn, char *header);
bool Curl_rtsp_connisdead(struct connectdata *check);
+CURLcode Curl_rtsp_parseheader(struct connectdata *conn, char *header);
#else
/* disabled */
+#define Curl_rtsp_parseheader(x,y) CURLE_NOT_BUILT_IN
#define Curl_rtsp_connisdead(x) TRUE
#endif /* CURL_DISABLE_RTSP */
1  lib/sendf.c
View
@@ -42,7 +42,6 @@
#include "sslgen.h"
#include "ssh.h"
#include "multiif.h"
-#include "rtsp.h"
#include "non-ascii.h"
#define _MPRINTF_REPLACE /* use the internal *printf() functions */
1  lib/transfer.c
View
@@ -101,7 +101,6 @@
#include "curl_memory.h"
#include "select.h"
#include "multiif.h"
-#include "rtsp.h"
#include "connect.h"
#include "non-ascii.h"
1  lib/url.c
View
@@ -139,7 +139,6 @@ int curl_win32_idn_to_ascii(const char *in, char **out);
#include "inet_ntop.h"
#include "http_ntlm.h"
#include "socks.h"
-#include "rtsp.h"
#include "curl_rtmp.h"
#include "gopher.h"
Please sign in to comment.
Something went wrong with that request. Please try again.