svn commit: r367771 - head/sbin/nvmecontrol

[Adrian Chadd]

Author: adrian
Date: Tue Nov 17 17:12:28 2020
New Revision: 367771
URL: https://svnweb.freebsd.org/changeset/base/367771

Log:
  [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

Modified:
  head/sbin/nvmecontrol/firmware.c

Modified: head/sbin/nvmecontrol/firmware.c
==============================================================================
--- head/sbin/nvmecontrol/firmware.c	Tue Nov 17 17:11:07 2020	(r367770)
+++ head/sbin/nvmecontrol/firmware.c	Tue Nov 17 17:12:28 2020	(r367771)
@@ -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 payl
 		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));