moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

Another Yang Tse warning cleanup raid!

Browse Source
This commit is contained in:
Daniel Stenberg 2005-12-05 14:10:48 +00:00
parent 67b4d9b232
commit 272231fb09
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ftp.c
View File

@ -3680,7 +3680,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
if(!ftp->dirs) if(!ftp->dirs)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
ftp->dirs[0] = curl_unescape(cur_pos, slash_pos-cur_pos); ftp->dirs[0] = curl_unescape(cur_pos, (int)(slash_pos-cur_pos));
if(!ftp->dirs[0]) { if(!ftp->dirs[0]) {
free(ftp->dirs); free(ftp->dirs);
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;

4
lib/tftp.c
View File

@ -261,7 +261,7 @@ static void tftp_send_first(tftp_state_data_t *state, tftp_event_t event)
if(data->set.upload) { if(data->set.upload) {
/* If we are uploading, send an WRQ */ /* If we are uploading, send an WRQ */
state->spacket.event = htons(TFTP_EVENT_WRQ); state->spacket.event = htons(TFTP_EVENT_WRQ);
filename = curl_unescape(filename, strlen(filename)); filename = curl_unescape(filename, (int)strlen(filename));
state->conn->upload_fromhere = (char *)state->spacket.u.data.data; state->conn->upload_fromhere = (char *)state->spacket.u.data.data;
if(data->set.infilesize != -1) { if(data->set.infilesize != -1) {
Curl_pgrsSetUploadSize(data, data->set.infilesize); Curl_pgrsSetUploadSize(data, data->set.infilesize);
@ -273,7 +273,7 @@ static void tftp_send_first(tftp_state_data_t *state, tftp_event_t event)
} }
sprintf((char *)state->spacket.u.request.data, "%s%c%s%c", sprintf((char *)state->spacket.u.request.data, "%s%c%s%c",
filename, '\0', mode, '\0'); filename, '\0', mode, '\0');
sbytes = 4 + strlen(filename) + strlen(mode); sbytes = 4 + (int)strlen(filename) + (int)strlen(mode);
sbytes = sendto(state->sockfd, (void *)&state->spacket, sbytes = sendto(state->sockfd, (void *)&state->spacket,
sbytes, 0, sbytes, 0,
state->conn->ip_addr->ai_addr, state->conn->ip_addr->ai_addr,

2
src/main.c
View File

@ -363,7 +363,7 @@ struct Configurable {
}; };
#define WARN_PREFIX "Warning: " #define WARN_PREFIX "Warning: "
#define WARN_TEXTWIDTH (79 - strlen(WARN_PREFIX)) #define WARN_TEXTWIDTH (79 - (int)strlen(WARN_PREFIX))
/* produce this text message to the user unless mute was selected */ /* produce this text message to the user unless mute was selected */
static void warnf(struct Configurable *config, const char *fmt, ...) static void warnf(struct Configurable *config, const char *fmt, ...)
{ {

2
src/mkhelp.pl
View File

@ -156,7 +156,7 @@ void hugehelp(void)
return; return;
headerlen = 10; headerlen = 10;
z.avail_in = sizeof(hugehelpgz) - headerlen; z.avail_in = (unsigned int)(sizeof(hugehelpgz) - headerlen);
z.next_in = (unsigned char *)hugehelpgz + headerlen; z.next_in = (unsigned char *)hugehelpgz + headerlen;
z.zalloc = (alloc_func)Z_NULL; z.zalloc = (alloc_func)Z_NULL;
z.zfree = (free_func)Z_NULL; z.zfree = (free_func)Z_NULL;

4
tests/server/tftpd.c
View File

@ -222,7 +222,7 @@ static void read_ahead(struct testcase *test,
if (convert == 0) { if (convert == 0) {
/* The former file reading code did this: /* The former file reading code did this:
b->counter = read(fileno(file), dp->th_data, SEGSIZE); */ b->counter = read(fileno(file), dp->th_data, SEGSIZE); */
int copy_n = MIN(SEGSIZE, test->rcount); size_t copy_n = MIN(SEGSIZE, test->rcount);
memcpy(dp->th_data, test->rptr, copy_n); memcpy(dp->th_data, test->rptr, copy_n);
/* decrease amount, advance pointer */ /* decrease amount, advance pointer */
@ -892,7 +892,7 @@ static void nak(int error)
tp->th_code = EUNDEF; /* set 'undef' errorcode */ tp->th_code = EUNDEF; /* set 'undef' errorcode */
} }
strcpy(tp->th_msg, pe->e_msg); strcpy(tp->th_msg, pe->e_msg);
length = strlen(pe->e_msg); length = (int)strlen(pe->e_msg);
tp->th_msg[length] = '\0'; tp->th_msg[length] = '\0';
length += 5; length += 5;
if (send(peer, buf, length, 0) != length) if (send(peer, buf, length, 0) != length)