Commit 4bb80cfd authored by Yang Tse's avatar Yang Tse
Browse files 

fix compiler warning
parent de2cc11a

lib/rtsp.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -650,6 +650,7 @@ CURLcode Curl_rtsp_rtp_readwrite(struct SessionHandle *data, 
  return CURLE_OK;

  return CURLE_OK;

}

}





static

CURLcode rtp_client_write(struct connectdata *conn, char *ptr, size_t len)

CURLcode rtp_client_write(struct connectdata *conn, char *ptr, size_t len)

{

{

  struct SessionHandle *data = conn->data;

  struct SessionHandle *data = conn->data;

lib/sendf.h

+3 −5
Original line number Original line Diff line number Diff line 
#ifndef __SENDF_H

#ifndef HEADER_CURL_SENDF_H

#define __SENDF_H

#define HEADER_CURL_SENDF_H

/***************************************************************************

/***************************************************************************

 *                                  _   _ ____  _

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |

 *  Project                     ___| | | |  _ \| |
@@ -55,8 +55,6 @@ void Curl_failf(struct SessionHandle *, const char *fmt, ...); 
CURLcode Curl_client_write(struct connectdata *conn, int type, char *ptr,

CURLcode Curl_client_write(struct connectdata *conn, int type, char *ptr,

                           size_t len);

                           size_t len);





CURLcode Curl_rtp_client_write(struct connectdata *conn, char *ptr, size_t len);



/* internal read-function, does plain socket only */

/* internal read-function, does plain socket only */

int Curl_read_plain(curl_socket_t sockfd,

int Curl_read_plain(curl_socket_t sockfd,

                    char *buf,

                    char *buf,
@@ -85,4 +83,4 @@ int Curl_debug(struct SessionHandle *handle, curl_infotype type, 
               struct connectdata *conn);

               struct connectdata *conn);









#endif /* __SENDF_H */
 
#endif /* HEADER_CURL_SENDF_H */

lib/transfer.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -369,7 +369,6 @@ static CURLcode readwrite_data(struct SessionHandle *data, 
  CURLcode result = CURLE_OK;

  CURLcode result = CURLE_OK;

  ssize_t nread; /* number of bytes read */

  ssize_t nread; /* number of bytes read */

  bool is_empty_data = FALSE;

  bool is_empty_data = FALSE;

  bool readmore = FALSE; /* used by RTP to signal for more data */





  *done = FALSE;

  *done = FALSE;
@@ -439,7 +438,7 @@ static CURLcode readwrite_data(struct SessionHandle *data, 




#ifndef CURL_DISABLE_RTSP

#ifndef CURL_DISABLE_RTSP

    if(conn->protocol & PROT_RTSP) {

    if(conn->protocol & PROT_RTSP) {

      readmore = FALSE;

      bool readmore = FALSE;

      result = Curl_rtsp_rtp_readwrite(data, conn, &nread, &readmore, done);

      result = Curl_rtsp_rtp_readwrite(data, conn, &nread, &readmore, done);

      if(result)

      if(result)

        return result;

        return result;

src/main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4134,7 +4134,7 @@ header_callback(void *ptr, size_t size, size_t nmemb, void *stream) 
    while (1) {

    while (1) {

      char *filename;

      char *filename;





      while (p < end && !isalpha(*p))

      while (*p && (p < end) && !ISALPHA(*p))

        p++;

        p++;

      if (p > end-9)

      if (p > end-9)

        break;

        break;