diff -ur redboot/current/ChangeLog redboot.patched/current/ChangeLog --- redboot/current/ChangeLog +++ redboot.patched/current/ChangeLog @@ -1,3 +1,7 @@ +2006-08-28 Sergei Gavrikov + + * src/net/tftp_client.c (tftp_error_ack): Fix compiler warnings. + 2006-07-21 David Ho * src/flash.c (fis_start_update_directory): Fix build error when diff -ur redboot/current/src/net/tftp_client.c redboot.patched/current/src/net/tftp_client.c --- redboot/current/src/net/tftp_client.c +++ redboot.patched/current/src/net/tftp_client.c @@ -164,13 +164,13 @@ struct tftphdr *hdr = (struct tftphdr *)tftp_stream.data; if (strlen(msg) > (SEGSIZE-1)) { - *(msg + SEGSIZE) = NULL; + *(msg + SEGSIZE) = 0; } if (tftp_stream.packets_received > 0) { hdr->th_opcode = htons(ERROR); hdr->th_code = code; - strcpy(&hdr->th_data, msg); + strcpy((char *)&hdr->th_data, msg); if (__udp_sendto(tftp_stream.data, (5 + strlen(msg)), &tftp_stream.from_addr, &tftp_stream.local_addr) < 0) { // Problem sending ACK