From 5599502a550a7f892d4b73dceb2105a6916f83e6 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sun, 18 May 2008 22:28:26 +0000 Subject: more -Wall warning fixes. -Wall is enabled now. --- networking/telnet.c | 2 +- networking/tftp.c | 12 ++++++------ networking/wget.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'networking') diff --git a/networking/telnet.c b/networking/telnet.c index 78229cd01..32e9993d3 100644 --- a/networking/telnet.c +++ b/networking/telnet.c @@ -68,7 +68,7 @@ struct globals { const char *autologin; #endif #if ENABLE_FEATURE_AUTOWIDTH - int win_width, win_height; + unsigned win_width, win_height; #endif /* same buffer used both for network and console read/write */ char buf[DATABUFSIZE]; diff --git a/networking/tftp.c b/networking/tftp.c index 143279757..36e63e0f7 100644 --- a/networking/tftp.c +++ b/networking/tftp.c @@ -246,7 +246,7 @@ static int tftp_protocol( local_fd = open_or_warn(local_file, open_mode); if (local_fd < 0) { /*error_pkt_reason = ERR_NOFILE/ERR_ACCESS?*/ - strcpy(error_pkt_str, "can't open file"); + strcpy((char*)error_pkt_str, "can't open file"); goto send_err_pkt; } } @@ -479,7 +479,7 @@ static int tftp_protocol( if (recv_blk == block_nr) { int sz = full_write(local_fd, &rbuf[4], len - 4); if (sz != len - 4) { - strcpy(error_pkt_str, bb_msg_write_error); + strcpy((char*)error_pkt_str, bb_msg_write_error); error_pkt_reason = ERR_WRITE; goto send_err_pkt; } @@ -525,12 +525,12 @@ static int tftp_protocol( return finished == 0; /* returns 1 on failure */ send_read_err_pkt: - strcpy(error_pkt_str, bb_msg_read_error); + strcpy((char*)error_pkt_str, bb_msg_read_error); send_err_pkt: if (error_pkt_str[0]) - bb_error_msg(error_pkt_str); + bb_error_msg((char*)error_pkt_str); error_pkt[1] = TFTP_ERROR; - xsendto(socket_fd, error_pkt, 4 + 1 + strlen(error_pkt_str), + xsendto(socket_fd, error_pkt, 4 + 1 + strlen((char*)error_pkt_str), &peer_lsa->u.sa, peer_lsa->len); return EXIT_FAILURE; } @@ -715,7 +715,7 @@ int tftpd_main(int argc ATTRIBUTE_UNUSED, char **argv) return result; err: - strcpy(error_pkt_str, error_msg); + strcpy((char*)error_pkt_str, error_msg); goto do_proto; } diff --git a/networking/wget.c b/networking/wget.c index 7dd1d36f9..84ee1ca3e 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -54,9 +54,9 @@ enum { STALLTIME = 5 /* Seconds when xfer considered "stalled" */ }; -static int getttywidth(void) +static unsigned int getttywidth(void) { - int width; + unsigned width; get_terminal_width_height(0, &width, NULL); return width; } -- cgit v1.2.3