hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

firmware-utils: fix compilation warnings.

Browse Source 
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

SVN-Revision: 42986
master
John Crispin 10 years ago
parent 829bf6b9a1
commit 7322fe161a
2 changed files with 4 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      tools/firmware-utils/src/buffalo-tftp.c
  2. 8
      tools/firmware-utils/src/mkrtn56uimg.c

2
tools/firmware-utils/src/buffalo-tftp.c
Unescape View File

@ -70,7 +70,6 @@ static int crypt_file(void)
{ {
unsigned char *buf = NULL; unsigned char *buf = NULL;
ssize_t src_len; ssize_t src_len;
ssize_t crypt_len;
int err; int err;
int ret = -1; int ret = -1;
@ -92,7 +91,6 @@ static int crypt_file(void)
goto out; goto out;
} }
crypt_len = (src_len > 512) ? 512 : src_len;
if (do_decrypt) if (do_decrypt)
crypt_header(buf, 512, crypt_key2, crypt_key1); crypt_header(buf, 512, crypt_key2, crypt_key1);
else else

8
tools/firmware-utils/src/mkrtn56uimg.c
Unescape View File

@ -89,13 +89,13 @@ calc_crc(image_header_t *hdr, void *data, uint32_t len)
/* /*
* Calculate payload checksum * 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); hdr->ih_size = htonl(len);
/* /*
* Calculate header checksum * Calculate header checksum
*/ */
hdr->ih_hcrc = 0; 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 @@ process_image(char *progname, char *filename, op_mode_t opmode)
} }
if (opmode == FACTORY) { 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.major = 0;
hdr->tail.asus.kernel.minor = 0; hdr->tail.asus.kernel.minor = 0;
hdr->tail.asus.fs.major = 0; hdr->tail.asus.fs.major = 0;
@ -231,7 +231,7 @@ process_image(char *progname, char *filename, op_mode_t opmode)
if (opmode == FACTORY) { if (opmode == FACTORY) {
hdr = ptr+offset_sec_header; hdr = ptr+offset_sec_header;
memcpy(hdr, ptr, sizeof(image_header_t)); 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(hdr, ptr+offset_kernel, offset_sqfs - offset_kernel);
calc_crc((image_header_t *)ptr, ptr+offset_kernel, offset_image_end - offset_kernel); calc_crc((image_header_t *)ptr, ptr+offset_kernel, offset_image_end - offset_kernel);
} else { } else {

Write Preview
Loading…
Cancel
Save