diff options
| author | Adrian Chadd <adrian@FreeBSD.org> | 2020-11-17 17:12:28 +0000 |
|---|---|---|
| committer | Adrian Chadd <adrian@FreeBSD.org> | 2020-11-17 17:12:28 +0000 |
| commit | 44c52406ced4cbba704f9bec588a8238d5a5ef32 (patch) | |
| tree | be7a96a442d9bd582a827f67a5ad9cdce2793d34 /sbin/nvmecontrol | |
| parent | 975e1c1ce64afd5a2ed1647c80888b0fb6c132ae (diff) | |
| download | src-44c52406ced4cbba704f9bec588a8238d5a5ef32.tar.gz src-44c52406ced4cbba704f9bec588a8238d5a5ef32.zip | |
[nvmecontrol] Fix type signedness warning-to-error on gcc-6.4
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
Notes
Notes:
svn path=/head/; revision=367771
Diffstat (limited to 'sbin/nvmecontrol')
| -rw-r--r-- | sbin/nvmecontrol/firmware.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/nvmecontrol/firmware.c b/sbin/nvmecontrol/firmware.c index ec7e54afc57e..e6ebc9b70321 100644 --- a/sbin/nvmecontrol/firmware.c +++ b/sbin/nvmecontrol/firmware.c @@ -159,8 +159,9 @@ static void update_firmware(int fd, uint8_t *payload, int32_t payload_size, uint8_t fwug) { struct nvme_pt_command pt; - uint64_t max_xfer_size; - int32_t off, resid, size; + uint64_t max_xfer_size; + int32_t off; + uint32_t resid, size; void *chunk; 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); while (resid > 0) { - size = (resid >= (int32_t)max_xfer_size) ? - max_xfer_size : resid; + size = (resid >= max_xfer_size) ? max_xfer_size : resid; memcpy(chunk, payload + off, size); memset(&pt, 0, sizeof(pt)); |