 @@ -82,27 +82,27 @@ void describe_drive(int, int, int, int,
  */
 #define MB_COMMAND	0
 #define MB_CHANNEL	1
 #define MB_PARAM	2
 #define MB_PAD		3
 #define MB_DRIVE	4
 #define FIRMWARE_40LD	1
 #define FIRMWARE_8LD	2
 static struct {
 	const char	*product;
-	const int	signature;
+	const uint32_t	signature;
 } prodtable[] = {
 	{	"Series 431",			AMR_SIG_431	},
 	{	"Series 438",			AMR_SIG_438	},
 	{	"Series 762",			AMR_SIG_762	},
 	{	"Integrated HP NetRAID (T5)",	AMR_SIG_T5	},
 	{	"Series 466",			AMR_SIG_466	},
 	{	"Series 467",			AMR_SIG_467	},
 	{	"Integrated HP NetRAID (T7)",	AMR_SIG_T7	},
 	{	"Series 490",			AMR_SIG_490	}
 };
 static struct {
 	const int	code;
 @@ -202,27 +202,27 @@ usage(char *prog)
 		"-v\t\tverbose output\n",
 		prog);
 	exit(1);
+}
 /******************************************************************************
  * Card description
  */
 int
 describe_card(int fd, int verbosity, int globalparam)
+{
 	struct amr_enquiry *ae;
-	int	cardtype;
+	uint32_t	cardtype;
 	/*
 	 * Try the 40LD firmware interface
 	 */
 	enq_result = amr_ioctl_enquiry(fd, AMR_CMD_CONFIG,
 		AMR_CONFIG_PRODUCT_INFO, 0);
 	if (enq_result == AMR_STATUS_SUCCESS) {
 		struct amr_prodinfo *ap;
 		ap = (struct amr_prodinfo *)enq_buffer;
 		nschan = ap->ap_nschan;
 		if (globalparam) {
 @@ -257,27 +257,27 @@ describe_card(int fd, int verbosity, int
 	ae = (struct amr_enquiry *)enq_buffer;
 	if (enq_result == AMR_STATUS_SUCCESS) {
 		cardtype = ae->ae_signature;
 	} else {
 		enq_result = amr_ioctl_enquiry(fd, AMR_CMD_ENQUIRY, 0, 0);
 		cardtype = 0;
+	}
 	if (enq_result == AMR_STATUS_SUCCESS) {
 		if (globalparam) {
 			const char   *product = NULL;
 			char	bios[100], firmware[100];
-			int	i;
+			size_t	i;
 			for (i = 0; i < NTAB(prodtable); i++) {
 				if (cardtype == prodtable[i].signature) {
 					product = prodtable[i].product;
 					break;
+				}
+			}
 			if (product == NULL)
 				product = "unknown card signature";
 			/*
 			 * HP NetRaid controllers have a special encoding of
 			 * the firmware and BIOS versions. The AMI version
 @@ -338,66 +338,66 @@ describe_card(int fd, int verbosity, int
+	}
 	/*
 	 * Neither firmware interface succeeded. Abort.
 	 */
 	fprintf(stderr, "Firmware interface not supported\n");
 	exit(1);
+}
 char *
 describe_property(u_int8_t prop, char *buffer)
+{
-	int	i;
+	size_t	i;
 	strcpy(buffer, "<");
 	for (i = 0; i < NTAB(proptable); i++) {
 		if (i > 0)
 			strcat(buffer, ",");
 		if (prop & proptable[i].code)
 			strcat(buffer, proptable[i].ifyes);
 		else
 			strcat(buffer, proptable[i].ifno);
+	}
 	strcat(buffer, ">");
 	return buffer;
+}
 const char *
 describe_state(int verbosity, u_int8_t state)
+{
-	int	i;
+	size_t	i;
 	if ((AMR_DRV_PREVSTATE(state) == AMR_DRV_CURSTATE(state)) &&
 	    (AMR_DRV_CURSTATE(state) == AMR_DRV_OFFLINE) && verbosity == 0)
 		return NULL;
 	for (i = 0; i < NTAB(statetable); i++)
 		if (AMR_DRV_CURSTATE(state) == statetable[i].code)
 			return (statetable[i].status);
 	return NULL;
+}
 /******************************************************************************
  * Battery status
  */
 void
 describe_battery(int fd, int verbosity, int fwint, int bflags, int globalparam)
+{
 	u_int8_t batt_status;
-	int i;
+	size_t i;
 	if (fwint == FIRMWARE_40LD) {
 		enq_result = amr_ioctl_enquiry(fd, AMR_CMD_CONFIG,
 			AMR_CONFIG_ENQ3, AMR_CONFIG_ENQ3_SOLICITED_FULL);
 		if (enq_result == AMR_STATUS_SUCCESS) {
 			struct amr_enquiry3 *ae3;
 			ae3 = (struct amr_enquiry3 *)enq_buffer;
 			if (bflags || globalparam) {
 				batt_status = ae3->ae_batterystatus;
 				printf("Battery status\t\t");
 				for (i = 0; i < NTAB(battable); i++) {
 					if (batt_status & battable[i].code)