d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[nvmecontrol] Fix type signedness warning-to-error on gcc-6.4

Browse Source 
This fixes a type signedness comparison warning-to-error on
gcc-6.4. The ternary operation casts it right but the actual
assignment doesn't.

Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D26791
This commit is contained in:
Adrian Chadd 2020-11-17 17:12:28 +00:00
parent 975e1c1ce6
commit 44c52406ce
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=367771
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/nvmecontrol/firmware.c
View File

@ -159,8 +159,9 @@ static void
update_firmware(int fd, uint8_t *payload, int32_t payload_size, uint8_t fwug) update_firmware(int fd, uint8_t *payload, int32_t payload_size, uint8_t fwug)
{ {
struct nvme_pt_command pt; struct nvme_pt_command pt;
uint64_t max_xfer_size; uint64_t max_xfer_size;
int32_t off, resid, size; int32_t off;
uint32_t resid, size;
void *chunk; void *chunk;
off = 0; off = 0;
@ -175,8 +176,7 @@ update_firmware(int fd, uint8_t *payload, int32_t payload_size, uint8_t fwug)
errx(EX_OSERR, "unable to malloc %zd bytes", (size_t)max_xfer_size); errx(EX_OSERR, "unable to malloc %zd bytes", (size_t)max_xfer_size);
while (resid > 0) { while (resid > 0) {
size = (resid >= (int32_t)max_xfer_size) ? size = (resid >= max_xfer_size) ? max_xfer_size : resid;
max_xfer_size : resid;
memcpy(chunk, payload + off, size); memcpy(chunk, payload + off, size);
memset(&pt, 0, sizeof(pt)); memset(&pt, 0, sizeof(pt));