diff options
| -rw-r--r-- | lib/rtsp.c | 1 | ||||
| -rw-r--r-- | lib/sendf.h | 8 | ||||
| -rw-r--r-- | lib/transfer.c | 3 | ||||
| -rw-r--r-- | src/main.c | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/lib/rtsp.c b/lib/rtsp.c index 1ffac3910..d61458c2c 100644 --- a/lib/rtsp.c +++ b/lib/rtsp.c @@ -650,6 +650,7 @@ CURLcode Curl_rtsp_rtp_readwrite(struct SessionHandle *data, return CURLE_OK; } +static CURLcode rtp_client_write(struct connectdata *conn, char *ptr, size_t len) { struct SessionHandle *data = conn->data; diff --git a/lib/sendf.h b/lib/sendf.h index 2ed975ec7..0614ac7e7 100644 --- a/lib/sendf.h +++ b/lib/sendf.h @@ -1,5 +1,5 @@ -#ifndef __SENDF_H -#define __SENDF_H +#ifndef HEADER_CURL_SENDF_H +#define HEADER_CURL_SENDF_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -55,8 +55,6 @@ void Curl_failf(struct SessionHandle *, const char *fmt, ...); CURLcode Curl_client_write(struct connectdata *conn, int type, char *ptr, size_t len); -CURLcode Curl_rtp_client_write(struct connectdata *conn, char *ptr, size_t len); - /* internal read-function, does plain socket only */ int Curl_read_plain(curl_socket_t sockfd, char *buf, @@ -85,4 +83,4 @@ int Curl_debug(struct SessionHandle *handle, curl_infotype type, struct connectdata *conn); -#endif /* __SENDF_H */ +#endif /* HEADER_CURL_SENDF_H */ diff --git a/lib/transfer.c b/lib/transfer.c index f936e2fa0..a59588853 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -369,7 +369,6 @@ static CURLcode readwrite_data(struct SessionHandle *data, CURLcode result = CURLE_OK; ssize_t nread; /* number of bytes read */ bool is_empty_data = FALSE; - bool readmore = FALSE; /* used by RTP to signal for more data */ *done = FALSE; @@ -439,7 +438,7 @@ static CURLcode readwrite_data(struct SessionHandle *data, #ifndef CURL_DISABLE_RTSP if(conn->protocol & PROT_RTSP) { - readmore = FALSE; + bool readmore = FALSE; result = Curl_rtsp_rtp_readwrite(data, conn, &nread, &readmore, done); if(result) return result; diff --git a/src/main.c b/src/main.c index a810ec78a..381f81097 100644 --- a/src/main.c +++ b/src/main.c @@ -4134,7 +4134,7 @@ header_callback(void *ptr, size_t size, size_t nmemb, void *stream) while (1) { char *filename; - while (p < end && !isalpha(*p)) + while (*p && (p < end) && !ISALPHA(*p)) p++; if (p > end-9) break; |