Commit 982c5460 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Andrew Francis removed the need for/use of MSVC pragmas

parent 2a3a8848

lib/config-win32.h

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ 
 *This is to eliminate the warnings when compiled *

 * using MS VC++ compiler	  			  *

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

#ifdef _MSC_VER

#if 0



#pragma warning (disable: 4244)	/* truncation from 'const int' to 'char' */

#pragma warning (disable: 4127)	/* conditional expression is constant */

lib/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ 
           (struct in_addr *)remotehost->h_addr_list[aliasindex],

           sizeof(struct in_addr));

    serv_addr.sin_family = remotehost->h_addrtype;

    serv_addr.sin_port = htons(port);

    serv_addr.sin_port = htons((unsigned short)port);

  

    rc = connect(sockfd, (struct sockaddr *)&serv_addr,

                 sizeof(serv_addr));

lib/http.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ CURLcode Curl_http(struct connectdata *conn) 
  if(data->cookies) {

    co = Curl_cookie_getlist(data->cookies,

                             host, ppath,

                             conn->protocol&PROT_HTTPS?TRUE:FALSE);

                             (conn->protocol&PROT_HTTPS?TRUE:FALSE));

  }

  if (data->change.proxy &&

      !data->set.tunnel_thru_httpproxy &&

lib/progress.c

+3 −3
Original line number Diff line number Diff line
@@ -344,8 +344,8 @@ int Curl_pgrsUpdate(struct connectdata *conn) 
  /* If we have a total estimate, we can display that and the expected

     time left */

  if(total_estimate) {

    time2str(time_left, total_estimate-(int) data->progress.timespent); 

    time2str(time_total, total_estimate);

    time2str(time_left, (int)(total_estimate - data->progress.timespent)); 

    time2str(time_total, (int)total_estimate);

  }

  else {

    /* otherwise we blank those times */
@@ -353,7 +353,7 @@ int Curl_pgrsUpdate(struct connectdata *conn) 
    strcpy(time_total, "--:--:--");

  }

  /* The time spent so far is always known */

  time2str(time_current, data->progress.timespent);

  time2str(time_current, (int)data->progress.timespent);



  /* Get the total amount of data expected to get transfered */

  total_expected_transfer =

lib/url.c

+2 −2
Original line number Diff line number Diff line
@@ -1349,7 +1349,7 @@ static CURLcode ConnectPlease(struct connectdata *conn, 
    memcpy((char *)&(conn->serv_addr.sin_addr),

           (struct in_addr *)addr, sizeof(struct in_addr));

    conn->serv_addr.sin_family = hostaddr->h_addrtype;

    conn->serv_addr.sin_port = htons(conn->port);

    conn->serv_addr.sin_port = htons((unsigned short)conn->port);

#endif

  }
@@ -2078,7 +2078,7 @@ static CURLcode CreateConnection(struct SessionHandle *data, 
      }



      *tmp = '\0'; /* cut off the name there */

      conn->remote_port = port;

      conn->remote_port = (unsigned short)port;

    }

  }