Author: blogic Date: 2014-10-20 08:29:13 +0200 (Mon, 20 Oct 2014) New Revision: 42986
Modified: trunk/tools/firmware-utils/src/buffalo-tftp.c trunk/tools/firmware-utils/src/mkrtn56uimg.c Log: firmware-utils: fix compilation warnings. Signed-off-by: Yousong Zhou <[email protected]> Modified: trunk/tools/firmware-utils/src/buffalo-tftp.c =================================================================== --- trunk/tools/firmware-utils/src/buffalo-tftp.c 2014-10-20 06:29:05 UTC (rev 42985) +++ trunk/tools/firmware-utils/src/buffalo-tftp.c 2014-10-20 06:29:13 UTC (rev 42986) @@ -70,7 +70,6 @@ { unsigned char *buf = NULL; ssize_t src_len; - ssize_t crypt_len; int err; int ret = -1; @@ -92,7 +91,6 @@ goto out; } - crypt_len = (src_len > 512) ? 512 : src_len; if (do_decrypt) crypt_header(buf, 512, crypt_key2, crypt_key1); else Modified: trunk/tools/firmware-utils/src/mkrtn56uimg.c =================================================================== --- trunk/tools/firmware-utils/src/mkrtn56uimg.c 2014-10-20 06:29:05 UTC (rev 42985) +++ trunk/tools/firmware-utils/src/mkrtn56uimg.c 2014-10-20 06:29:13 UTC (rev 42986) @@ -89,13 +89,13 @@ /* * Calculate payload checksum */ - hdr->ih_dcrc = htonl(crc32(0, data, len)); + hdr->ih_dcrc = htonl(crc32(0, (Bytef *)data, len)); hdr->ih_size = htonl(len); /* * Calculate header checksum */ hdr->ih_hcrc = 0; - hdr->ih_hcrc = htonl(crc32(0, hdr, sizeof(image_header_t))); + hdr->ih_hcrc = htonl(crc32(0, (Bytef *)hdr, sizeof(image_header_t))); } @@ -166,7 +166,7 @@ } if (opmode == FACTORY) { - strncpy(&namebuf, (char *)&hdr->tail.ih_name, IH_NMLEN); + strncpy(namebuf, hdr->tail.ih_name, IH_NMLEN); hdr->tail.asus.kernel.major = 0; hdr->tail.asus.kernel.minor = 0; hdr->tail.asus.fs.major = 0; @@ -231,7 +231,7 @@ if (opmode == FACTORY) { hdr = ptr+offset_sec_header; memcpy(hdr, ptr, sizeof(image_header_t)); - strncpy((char *)&hdr->tail.ih_name, &namebuf, IH_NMLEN); + strncpy(hdr->tail.ih_name, namebuf, IH_NMLEN); calc_crc(hdr, ptr+offset_kernel, offset_sqfs - offset_kernel); calc_crc((image_header_t *)ptr, ptr+offset_kernel, offset_image_end - offset_kernel); } else { _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
