aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-12-05 14:10:48 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-12-05 14:10:48 +0000
commit272231fb09052e97a218d9ea00db57692d59c1de (patch)
treeea9eaa8fcbbd463489490a51052d6d7572ce1539
parent67b4d9b232923ec2ba5bbb2f929254cf95e953db (diff)
Another Yang Tse warning cleanup raid!
-rw-r--r--lib/ftp.c2
-rw-r--r--lib/tftp.c4
-rw-r--r--src/main.c2
-rw-r--r--src/mkhelp.pl2
-rw-r--r--tests/server/tftpd.c4
5 files changed, 7 insertions, 7 deletions
diff --git a/lib/ftp.c b/lib/ftp.c
index 4af0bda76..6c35ce215 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -3680,7 +3680,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
if(!ftp->dirs)
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]) {
free(ftp->dirs);
return CURLE_OUT_OF_MEMORY;
diff --git a/lib/tftp.c b/lib/tftp.c
index ce950054d..e9d17ee1d 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -261,7 +261,7 @@ static void tftp_send_first(tftp_state_data_t *state, tftp_event_t event)
if(data->set.upload) {
/* If we are uploading, send an 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;
if(data->set.infilesize != -1) {
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",
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, 0,
state->conn->ip_addr->ai_addr,
diff --git a/src/main.c b/src/main.c
index 4eba7bd7b..c697f6d65 100644
--- a/src/main.c
+++ b/src/main.c
@@ -363,7 +363,7 @@ struct Configurable {
};
#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 */
static void warnf(struct Configurable *config, const char *fmt, ...)
{
diff --git a/src/mkhelp.pl b/src/mkhelp.pl
index 318e5986d..6610760bf 100644
--- a/src/mkhelp.pl
+++ b/src/mkhelp.pl
@@ -156,7 +156,7 @@ void hugehelp(void)
return;
headerlen = 10;
- z.avail_in = sizeof(hugehelpgz) - headerlen;
+ z.avail_in = (unsigned int)(sizeof(hugehelpgz) - headerlen);
z.next_in = (unsigned char *)hugehelpgz + headerlen;
z.zalloc = (alloc_func)Z_NULL;
z.zfree = (free_func)Z_NULL;
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index eb57a1405..cf85623af 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -222,7 +222,7 @@ static void read_ahead(struct testcase *test,
if (convert == 0) {
/* The former file reading code did this:
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);
/* decrease amount, advance pointer */
@@ -892,7 +892,7 @@ static void nak(int error)
tp->th_code = EUNDEF; /* set 'undef' errorcode */
}
strcpy(tp->th_msg, pe->e_msg);
- length = strlen(pe->e_msg);
+ length = (int)strlen(pe->e_msg);
tp->th_msg[length] = '\0';
length += 5;
if (send(peer, buf, length, 0) != length)