diff options
author | Bill Meier <wmeier@newsguy.com> | 2014-08-05 14:54:55 -0400 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2014-08-05 19:07:28 +0000 |
commit | 72c2a33437404dfdf1e4cac9fdcbab854ba6f68e (patch) | |
tree | 343570bc82675c6fcea77bdfa819d415d791bb1b /epan/dissectors/packet-scsi-smc.c | |
parent | 9dc332454aa50e62e68d854cb03eee615b8999f1 (diff) |
Do various minor dissector changes:
- remove unneeded initializers;
- replace tabs in files with editor mode line 'expandtabs';
- col_set_str() --> col_add_str() (in one case);
- tvb_length() -- > tvb_reported_length() (in one case);
- do some whitespace & indentation fixes/changes.
Change-Id: Ib8ffbbcdb6e4a74c0df6021a75430ae1ef9ae089
Reviewed-on: https://code.wireshark.org/review/3435
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-scsi-smc.c')
-rw-r--r-- | epan/dissectors/packet-scsi-smc.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c index 885414b055..d479b972e5 100644 --- a/epan/dissectors/packet-scsi-smc.c +++ b/epan/dissectors/packet-scsi-smc.c @@ -37,24 +37,24 @@ void proto_register_scsi_smc(void); -static int proto_scsi_smc = -1; -int hf_scsi_smc_opcode = -1; -static int hf_scsi_smc_mta = -1; -static int hf_scsi_smc_sa = -1; -static int hf_scsi_smc_da = -1; -static int hf_scsi_smc_fda = -1; -static int hf_scsi_smc_sda = -1; -static int hf_scsi_smc_medium_flags = -1; -static int hf_scsi_smc_inv1 = -1; -static int hf_scsi_smc_inv2 = -1; -static int hf_scsi_smc_range_flags = -1; -static int hf_scsi_smc_fast = -1; -static int hf_scsi_smc_range = -1; -/* static int hf_scsi_smc_sea = -1; */ -static int hf_scsi_smc_num_elements = -1; -static int hf_scsi_smc_invert = -1; -static int hf_scsi_smc_ea = -1; -static int hf_scsi_smc_action_code = -1; +static int proto_scsi_smc = -1; +int hf_scsi_smc_opcode = -1; +static int hf_scsi_smc_mta = -1; +static int hf_scsi_smc_sa = -1; +static int hf_scsi_smc_da = -1; +static int hf_scsi_smc_fda = -1; +static int hf_scsi_smc_sda = -1; +static int hf_scsi_smc_medium_flags = -1; +static int hf_scsi_smc_inv1 = -1; +static int hf_scsi_smc_inv2 = -1; +static int hf_scsi_smc_range_flags = -1; +static int hf_scsi_smc_fast = -1; +static int hf_scsi_smc_range = -1; +/* static int hf_scsi_smc_sea = -1; */ +static int hf_scsi_smc_num_elements = -1; +static int hf_scsi_smc_invert = -1; +static int hf_scsi_smc_ea = -1; +static int hf_scsi_smc_action_code = -1; /* Generated from convert_proto_tree_add_text.pl */ static int hf_scsi_smc_allocation_length = -1; static int hf_scsi_smc_first_element_address_reported = -1; @@ -96,9 +96,9 @@ static int hf_scsi_smc_primary_vol_seq_num = -1; static int hf_scsi_smc_alternate_vol_tag_id = -1; static int hf_scsi_smc_alternate_vol_seq_num = -1; -static gint ett_scsi_exchange_medium = -1; -static gint ett_scsi_range = -1; -static gint ett_scsi_move = -1; +static gint ett_scsi_exchange_medium = -1; +static gint ett_scsi_range = -1; +static gint ett_scsi_move = -1; static void dissect_smc_exchangemedium (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, @@ -108,7 +108,7 @@ dissect_smc_exchangemedium (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t static const int *exchg_fields[] = { &hf_scsi_smc_inv1, &hf_scsi_smc_inv2, - NULL + NULL }; if (!tree) @@ -133,7 +133,7 @@ dissect_smc_position_to_element (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr { static const int *pte_fields[] = { &hf_scsi_smc_invert, - NULL + NULL }; if (!tree) @@ -171,7 +171,7 @@ dissect_smc_initialize_element_status_with_range (tvbuff_t *tvb, packet_info *pi static const int *range_fields[] = { &hf_scsi_smc_fast, &hf_scsi_smc_range, - NULL + NULL }; if (!tree) @@ -209,7 +209,7 @@ dissect_smc_movemedium (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, { static const int *move_fields[] = { &hf_scsi_smc_invert, - NULL + NULL }; if (!tree) @@ -266,7 +266,7 @@ dissect_scsi_smc_volume_tag (tvbuff_t *tvb, packet_info *pinfo _U_, tvb_memcpy (tvb, (guint8 *)volid, offset, 32); p = &volid[32]; for (;;) { - *p = '\0'; + *p = '\0'; if (p == volid) break; if (*(p - 1) != ' ') @@ -445,8 +445,8 @@ dissect_scsi_smc_elements (tvbuff_t *tvb, packet_info *pinfo, if (elem_bytecnt > desc_bytecnt) elem_bytecnt = desc_bytecnt; - if (elem_bytecnt < 2) - break; + if (elem_bytecnt < 2) + break; dissect_scsi_smc_element (tvb, pinfo, tree, offset, elem_bytecnt, elem_type, voltag_flags); @@ -876,32 +876,32 @@ proto_register_scsi_smc(void) FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL} }, - { &hf_scsi_smc_medium_flags, + { &hf_scsi_smc_medium_flags, {"Flags", "scsi_smc.medium_flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, - { &hf_scsi_smc_inv1, + { &hf_scsi_smc_inv1, {"INV1", "scsi_smc.inv1", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL} }, - { &hf_scsi_smc_inv2, + { &hf_scsi_smc_inv2, {"INV2", "scsi_smc.inv2", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL} }, - { &hf_scsi_smc_range_flags, + { &hf_scsi_smc_range_flags, {"Flags", "scsi_smc.range_flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} }, - { &hf_scsi_smc_fast, + { &hf_scsi_smc_fast, {"FAST", "scsi_smc.fast", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL} }, - { &hf_scsi_smc_range, + { &hf_scsi_smc_range, {"RANGE", "scsi_smc.range", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL} @@ -918,7 +918,7 @@ proto_register_scsi_smc(void) FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL} }, - { &hf_scsi_smc_invert, + { &hf_scsi_smc_invert, {"INVERT", "scsi_smc.invert", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL} |