Get rid of BASE_BIN - it's just the same as BASE_DEC, but people seemed

to be using it for stuff that should be hex, and for stuff that should
be Boolean.  Use BASE_DEC if it should be decimal, BASE_HEX if it should
be hex, and make it Boolean if it should be Boolean.

svn path=/trunk/; revision=7053

1 files changed, 15 insertions, 15 deletions

diff --git a/packet-scsi.c b/packet-scsi.c
index d6d7322ec0..8417dc6bea 100644
--- a/packet-scsi.c
+++ b/packet-scsi.c
@@ -2,7 +2,7 @@
  * Routines for decoding SCSI CDBs and responses
  * Author: Dinesh G Dutt (ddutt@cisco.com)
  *
- * $Id: packet-scsi.c,v 1.22 2002/12/02 23:43:29 guy Exp $
+ * $Id: packet-scsi.c,v 1.23 2003/01/31 03:17:46 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -4801,7 +4801,7 @@ proto_register_scsi (void)
           {"Control", "scsi.cdb.control", FT_UINT8, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_scsi_inquiry_flags,
-          {"Flags", "scsi.inquiry.flags", FT_UINT8, BASE_BIN, NULL, 0x0, "",
+          {"Flags", "scsi.inquiry.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_scsi_inquiry_evpd_page,
           {"EVPD Page Code", "scsi.inquiry.evpd.pagecode", FT_UINT8, BASE_HEX,
@@ -4813,16 +4813,16 @@ proto_register_scsi (void)
           {"Allocation Length", "scsi.cdb.alloclen", FT_UINT8, BASE_DEC, NULL,
            0x0, "", HFILL}},
         { &hf_scsi_logsel_flags,
-          {"Flags", "scsi.logsel.flags", FT_UINT8, BASE_BIN, NULL, 0x0, "",
+          {"Flags", "scsi.logsel.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_scsi_log_pc,
-          {"Page Control", "scsi.log.pc", FT_UINT8, BASE_BIN,
+          {"Page Control", "scsi.log.pc", FT_UINT8, BASE_DEC,
            VALS (scsi_logsel_pc_val), 0xC0, "", HFILL}},
         { &hf_scsi_paramlen,
           {"Parameter Length", "scsi.cdb.paramlen", FT_UINT8, BASE_DEC, NULL,
            0x0, "", HFILL}},
         { &hf_scsi_logsns_flags,
-          {"Flags", "scsi.logsns.flags", FT_UINT16, BASE_BIN, NULL, 0x0, "",
+          {"Flags", "scsi.logsns.flags", FT_UINT16, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_scsi_logsns_pagecode,
           {"Page Code", "scsi.logsns.pagecode", FT_UINT8, BASE_HEX,
@@ -4831,13 +4831,13 @@ proto_register_scsi (void)
           {"Parameter Length", "scsi.cdb.paramlen16", FT_UINT16, BASE_DEC, NULL,
            0x0, "", HFILL}},
         { &hf_scsi_modesel_flags,
-          {"Mode Sense/Select Flags", "scsi.cdb.mode.flags", FT_UINT8, BASE_BIN,
+          {"Mode Sense/Select Flags", "scsi.cdb.mode.flags", FT_UINT8, BASE_HEX,
            NULL, 0x0, "", HFILL}},
         { &hf_scsi_alloclen16,
           {"Allocation Length", "scsi.cdb.alloclen16", FT_UINT16, BASE_DEC,
            NULL, 0x0, "", HFILL}},
         { &hf_scsi_modesns_pc,
-          {"Page Control", "scsi.mode.pc", FT_UINT8, BASE_BIN,
+          {"Page Control", "scsi.mode.pc", FT_UINT8, BASE_DEC,
            VALS (scsi_modesns_pc_val), 0xC0, "", HFILL}},
         { &hf_scsi_spcpagecode,
           {"SPC-2 Page Code", "scsi.mode.spc.pagecode", FT_UINT8, BASE_HEX,
@@ -4867,7 +4867,7 @@ proto_register_scsi (void)
           {"Reservation Type", "scsi.persresv.type", FT_UINT8, BASE_HEX,
            VALS (scsi_persresv_type_val), 0x0F, "", HFILL}},
         { &hf_scsi_release_flags,
-          {"Release Flags", "scsi.release.flags", FT_UINT8, BASE_BIN, NULL,
+          {"Release Flags", "scsi.release.flags", FT_UINT8, BASE_HEX, NULL,
            0x0, "", HFILL}},
         { &hf_scsi_release_thirdpartyid,
           {"Third-Party ID", "scsi.release.thirdpartyid", FT_BYTES, BASE_HEX,
@@ -4876,10 +4876,10 @@ proto_register_scsi (void)
           {"Allocation Length", "scsi.cdb.alloclen32", FT_UINT32, BASE_DEC,
            NULL, 0x0, "", HFILL}},
         { &hf_scsi_formatunit_flags,
-          {"Flags", "scsi.formatunit.flags", FT_UINT8, BASE_BIN, NULL, 0xF8,
+          {"Flags", "scsi.formatunit.flags", FT_UINT8, BASE_HEX, NULL, 0xF8,
            "", HFILL}},
         { &hf_scsi_cdb_defectfmt,
-          {"Defect List Format", "scsi.cdb.defectfmt", FT_UINT8, BASE_BIN,
+          {"Defect List Format", "scsi.cdb.defectfmt", FT_UINT8, BASE_DEC,
            NULL, 0x7, "", HFILL}},
         { &hf_scsi_formatunit_interleave,
           {"Interleave", "scsi.formatunit.interleave", FT_UINT16, BASE_HEX,
@@ -4909,19 +4909,19 @@ proto_register_scsi (void)
           {"Logical Block Address (LBA)", "scsi.rdwr16.lba", FT_BYTES, BASE_DEC,
            NULL, 0x0, "", HFILL}},
         { &hf_scsi_readcapacity_flags,
-          {"Flags", "scsi.readcapacity.flags", FT_UINT8, BASE_BIN, NULL, 0x0,
+          {"Flags", "scsi.readcapacity.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
            "", HFILL}},
         { &hf_scsi_readcapacity_lba,
           {"Logical Block Address", "scsi.readcapacity.lba", FT_UINT32, BASE_DEC,
            NULL, 0x0, "", HFILL}},
         { &hf_scsi_readcapacity_pmi,
-          {"PMI", "scsi.readcapacity.pmi", FT_UINT8, BASE_BIN, NULL, 0x1, "",
+          {"PMI", "scsi.readcapacity.pmi", FT_UINT8, BASE_DEC, NULL, 0x1, "",
            HFILL}},
         { &hf_scsi_readdefdata_flags,
-          {"Flags", "scsi.readdefdata.flags", FT_UINT8, BASE_BIN, NULL, 0x0, "",
+          {"Flags", "scsi.readdefdata.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_scsi_reassignblks_flags,
-          {"Flags", "scsi.reassignblks.flags", FT_UINT8, BASE_BIN, NULL, 0x0, "",
+          {"Flags", "scsi.reassignblks.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_scsi_inq_devtype,
           {"Device Type", "scsi.inquiry.devtype", FT_UINT8, BASE_HEX,
@@ -4942,7 +4942,7 @@ proto_register_scsi (void)
           {"MRIE", "scsi.mode.mrie", FT_UINT8, BASE_HEX,
            VALS (scsi_modesns_mrie_val), 0x0F, "", HFILL}},
         { &hf_scsi_modesns_tst,
-          {"Task Set Type", "scsi.mode.tst", FT_UINT8, BASE_BIN,
+          {"Task Set Type", "scsi.mode.tst", FT_UINT8, BASE_DEC,
            VALS (scsi_modesns_tst_val), 0xE0, "", HFILL}},
         { &hf_scsi_modesns_qmod,
           {"Queue Algorithm Modifier", "scsi.mode.qmod", FT_UINT8, BASE_HEX,