Index: sbin/camcontrol/camcontrol.c
===================================================================
--- sbin/camcontrol/camcontrol.c
+++ sbin/camcontrol/camcontrol.c
@@ -66,52 +66,52 @@
 #endif
 
 typedef enum {
-	CAM_CMD_NONE		= 0x00000000,
-	CAM_CMD_DEVLIST		= 0x00000001,
-	CAM_CMD_TUR		= 0x00000002,
-	CAM_CMD_INQUIRY		= 0x00000003,
-	CAM_CMD_STARTSTOP	= 0x00000004,
-	CAM_CMD_RESCAN		= 0x00000005,
-	CAM_CMD_READ_DEFECTS	= 0x00000006,
-	CAM_CMD_MODE_PAGE	= 0x00000007,
-	CAM_CMD_SCSI_CMD	= 0x00000008,
-	CAM_CMD_DEVTREE		= 0x00000009,
-	CAM_CMD_USAGE		= 0x0000000a,
-	CAM_CMD_DEBUG		= 0x0000000b,
-	CAM_CMD_RESET		= 0x0000000c,
-	CAM_CMD_FORMAT		= 0x0000000d,
-	CAM_CMD_TAG		= 0x0000000e,
-	CAM_CMD_RATE		= 0x0000000f,
-	CAM_CMD_DETACH		= 0x00000010,
-	CAM_CMD_REPORTLUNS	= 0x00000011,
-	CAM_CMD_READCAP		= 0x00000012,
-	CAM_CMD_IDENTIFY	= 0x00000013,
-	CAM_CMD_IDLE		= 0x00000014,
-	CAM_CMD_STANDBY		= 0x00000015,
-	CAM_CMD_SLEEP		= 0x00000016,
-	CAM_CMD_SMP_CMD		= 0x00000017,
-	CAM_CMD_SMP_RG		= 0x00000018,
-	CAM_CMD_SMP_PC		= 0x00000019,
-	CAM_CMD_SMP_PHYLIST	= 0x0000001a,
-	CAM_CMD_SMP_MANINFO	= 0x0000001b,
-	CAM_CMD_DOWNLOAD_FW	= 0x0000001c,
-	CAM_CMD_SECURITY	= 0x0000001d,
-	CAM_CMD_HPA		= 0x0000001e,
-	CAM_CMD_SANITIZE	= 0x0000001f,
-	CAM_CMD_PERSIST		= 0x00000020,
-	CAM_CMD_APM		= 0x00000021,
-	CAM_CMD_AAM		= 0x00000022,
-	CAM_CMD_ATTRIB		= 0x00000023,
-	CAM_CMD_OPCODES		= 0x00000024,
-	CAM_CMD_REPROBE		= 0x00000025,
-	CAM_CMD_ZONE		= 0x00000026,
-	CAM_CMD_EPC		= 0x00000027,
-	CAM_CMD_TIMESTAMP	= 0x00000028,
-	CAM_CMD_MMCSD_CMD	= 0x00000029,
-	CAM_CMD_POWER_MODE	= 0x0000002a,
-	CAM_CMD_DEVTYPE		= 0x0000002b,
-	CAM_CMD_AMA	= 0x0000002c,
-} cam_cmdmask;
+	CAM_CMD_NONE,
+	CAM_CMD_DEVLIST,
+	CAM_CMD_TUR,
+	CAM_CMD_INQUIRY,
+	CAM_CMD_STARTSTOP,
+	CAM_CMD_RESCAN,
+	CAM_CMD_READ_DEFECTS,
+	CAM_CMD_MODE_PAGE,
+	CAM_CMD_SCSI_CMD,
+	CAM_CMD_DEVTREE,
+	CAM_CMD_USAGE,
+	CAM_CMD_DEBUG,
+	CAM_CMD_RESET,
+	CAM_CMD_FORMAT,
+	CAM_CMD_TAG,
+	CAM_CMD_RATE,
+	CAM_CMD_DETACH,
+	CAM_CMD_REPORTLUNS,
+	CAM_CMD_READCAP,
+	CAM_CMD_IDENTIFY,
+	CAM_CMD_IDLE,
+	CAM_CMD_STANDBY,
+	CAM_CMD_SLEEP,
+	CAM_CMD_SMP_CMD,
+	CAM_CMD_SMP_RG,
+	CAM_CMD_SMP_PC,
+	CAM_CMD_SMP_PHYLIST,
+	CAM_CMD_SMP_MANINFO,
+	CAM_CMD_DOWNLOAD_FW,
+	CAM_CMD_SECURITY,
+	CAM_CMD_HPA,
+	CAM_CMD_SANITIZE,
+	CAM_CMD_PERSIST,
+	CAM_CMD_APM,
+	CAM_CMD_AAM,
+	CAM_CMD_ATTRIB,
+	CAM_CMD_OPCODES,
+	CAM_CMD_REPROBE,
+	CAM_CMD_ZONE,
+	CAM_CMD_EPC,
+	CAM_CMD_TIMESTAMP,
+	CAM_CMD_MMCSD_CMD,
+	CAM_CMD_POWER_MODE,
+	CAM_CMD_DEVTYPE,
+	CAM_CMD_AMA,
+} cam_cmd;
 
 typedef enum {
 	CAM_ARG_NONE		= 0x00000000,
@@ -248,7 +248,6 @@
 	path_id_t path_id;
 };
 
-static cam_cmdmask cmdlist;
 static cam_argmask arglist;
 
 static const char *devtype_names[] = {
@@ -10281,6 +10280,7 @@
 	int error = 0, optstart = 2;
 	int task_attr = MSG_SIMPLE_Q_TAG;
 	int devopen = 1;
+	cam_cmd cmdlist;
 	path_id_t bus;
 	target_id_t target;
 	lun_id_t lun;