moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

Andrew Francis removed the need for/use of MSVC pragmas

Browse Source
This commit is contained in:
Daniel Stenberg 2002-08-26 17:20:29 +00:00
parent 2a3a8848f3
commit 982c5460f0
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/config-win32.h
View File

@ -202,7 +202,7 @@
*This is to eliminate the warnings when compiled * *This is to eliminate the warnings when compiled *
* using MS VC++ compiler * * using MS VC++ compiler *
**************************************************/ **************************************************/
#ifdef _MSC_VER #if 0
#pragma warning (disable: 4244) /* truncation from 'const int' to 'char' */ #pragma warning (disable: 4244) /* truncation from 'const int' to 'char' */
#pragma warning (disable: 4127) /* conditional expression is constant */ #pragma warning (disable: 4127) /* conditional expression is constant */

2
lib/connect.c
View File

@ -602,7 +602,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */
(struct in_addr *)remotehost->h_addr_list[aliasindex], (struct in_addr *)remotehost->h_addr_list[aliasindex],
sizeof(struct in_addr)); sizeof(struct in_addr));
serv_addr.sin_family = remotehost->h_addrtype; 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, rc = connect(sockfd, (struct sockaddr *)&serv_addr,
sizeof(serv_addr)); sizeof(serv_addr));

2
lib/http.c
View File

@ -552,7 +552,7 @@ CURLcode Curl_http(struct connectdata *conn)
if(data->cookies) { if(data->cookies) {
co = Curl_cookie_getlist(data->cookies, co = Curl_cookie_getlist(data->cookies,
host, ppath, host, ppath,
conn->protocol&PROT_HTTPS?TRUE:FALSE); (conn->protocol&PROT_HTTPS?TRUE:FALSE));
} }
if (data->change.proxy && if (data->change.proxy &&
!data->set.tunnel_thru_httpproxy && !data->set.tunnel_thru_httpproxy &&

6
lib/progress.c
View File

@ -344,8 +344,8 @@ int Curl_pgrsUpdate(struct connectdata *conn)
/* If we have a total estimate, we can display that and the expected /* If we have a total estimate, we can display that and the expected
time left */ time left */
if(total_estimate) { if(total_estimate) {
time2str(time_left, total_estimate-(int) data->progress.timespent); time2str(time_left, (int)(total_estimate - data->progress.timespent));
time2str(time_total, total_estimate); time2str(time_total, (int)total_estimate);
} }
else { else {
/* otherwise we blank those times */ /* otherwise we blank those times */
@ -353,7 +353,7 @@ int Curl_pgrsUpdate(struct connectdata *conn)
strcpy(time_total, "--:--:--"); strcpy(time_total, "--:--:--");
} }
/* The time spent so far is always known */ /* 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 */ /* Get the total amount of data expected to get transfered */
total_expected_transfer = total_expected_transfer =

4
lib/url.c
View File

@ -1349,7 +1349,7 @@ static CURLcode ConnectPlease(struct connectdata *conn,
memcpy((char *)&(conn->serv_addr.sin_addr), memcpy((char *)&(conn->serv_addr.sin_addr),
(struct in_addr *)addr, sizeof(struct in_addr)); (struct in_addr *)addr, sizeof(struct in_addr));
conn->serv_addr.sin_family = hostaddr->h_addrtype; 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 #endif
} }
@ -2078,7 +2078,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
} }
*tmp = '\0'; /* cut off the name there */ *tmp = '\0'; /* cut off the name there */
conn->remote_port = port; conn->remote_port = (unsigned short)port;
} }
} }

14
src/main.c
View File

@ -2011,32 +2011,32 @@ int myprogress (void *clientp,
char line[256]; char line[256];
char outline[256]; char outline[256];
char format[40]; char format[40];
float frac; double frac;
float percent; double percent;
int barwidth; int barwidth;
int num; int num;
int i; int i;
struct ProgressData *bar = (struct ProgressData *)clientp; struct ProgressData *bar = (struct ProgressData *)clientp;
size_t total = dltotal + ultotal; double total = dltotal + ultotal;
bar->point = dlnow + ulnow; /* we've come this far */ bar->point = dlnow + ulnow; /* we've come this far */
bar->calls++; /* simply count invokes */ bar->calls++; /* simply count invokes */
if(0 == total) { if(0 == total) {
int prevblock = bar->prev / 1024; int prevblock = (int)bar->prev / 1024;
int thisblock = bar->point / 1024; int thisblock = (int)bar->point / 1024;
while ( thisblock > prevblock ) { while ( thisblock > prevblock ) {
fprintf( bar->out, "#" ); fprintf( bar->out, "#" );
prevblock++; prevblock++;
} }
} }
else { else {
frac = (float) bar->point / (float) total; frac = bar->point / total;
percent = frac * 100.0f; percent = frac * 100.0f;
barwidth = bar->width - 7; barwidth = bar->width - 7;
num = (int) (((float)barwidth) * frac); num = (int) (((double)barwidth) * frac);
i = 0; i = 0;
for ( i = 0; i < num; i++ ) { for ( i = 0; i < num; i++ ) {
line[i] = '#'; line[i] = '#';