aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-scsi-osd.c
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2011-10-10 00:39:31 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2011-10-10 00:39:31 +0000
commita22559941fee1c629c118c45c98358c121937ffd (patch)
tree279279f3db0b5f366362166344c1cc92c0d44b38 /epan/dissectors/packet-scsi-osd.c
parent909a1add4166b5347444d494a2f258aec6a258a2 (diff)
Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors:
Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_BOOLEAN FT_IPv4 FT_EUI64 FT_GUID FT_UINT_STRING Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39328 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-scsi-osd.c')
-rw-r--r--epan/dissectors/packet-scsi-osd.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c
index 47444329d2..329ffb1c05 100644
--- a/epan/dissectors/packet-scsi-osd.c
+++ b/epan/dissectors/packet-scsi-osd.c
@@ -403,12 +403,12 @@ dissect_osd_option(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
tree = proto_item_add_subtree(it, ett_osd_option);
}
- proto_tree_add_item(tree, hf_scsi_osd_option_dpo, tvb, offset, 1, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_option_dpo, tvb, offset, 1, ENC_BIG_ENDIAN);
if(option&0x10){
proto_item_append_text(tree, " DPO");
}
- proto_tree_add_item(tree, hf_scsi_osd_option_fua, tvb, offset, 1, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_option_fua, tvb, offset, 1, ENC_BIG_ENDIAN);
if(option&0x08){
proto_item_append_text(tree, " FUA");
}
@@ -662,47 +662,47 @@ dissect_osd_permissions(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
tree = proto_item_add_subtree(it, ett_osd_permission_bitmask);
}
- proto_tree_add_item(tree, hf_scsi_osd_permissions_read, tvb, offset, 2, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_read, tvb, offset, 2, ENC_BIG_ENDIAN);
if(permissions&0x8000){
proto_item_append_text(tree, " READ");
}
- proto_tree_add_item(tree, hf_scsi_osd_permissions_write, tvb, offset, 2, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_write, tvb, offset, 2, ENC_BIG_ENDIAN);
if(permissions&0x4000){
proto_item_append_text(tree, " WRITE");
}
- proto_tree_add_item(tree, hf_scsi_osd_permissions_get_attr, tvb, offset, 2, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_get_attr, tvb, offset, 2, ENC_BIG_ENDIAN);
if(permissions&0x2000){
proto_item_append_text(tree, " GET_ATTR");
}
- proto_tree_add_item(tree, hf_scsi_osd_permissions_set_attr, tvb, offset, 2, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_set_attr, tvb, offset, 2, ENC_BIG_ENDIAN);
if(permissions&0x1000){
proto_item_append_text(tree, " SET_ATTR");
}
- proto_tree_add_item(tree, hf_scsi_osd_permissions_create, tvb, offset, 2, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_create, tvb, offset, 2, ENC_BIG_ENDIAN);
if(permissions&0x0800){
proto_item_append_text(tree, " CREATE");
}
- proto_tree_add_item(tree, hf_scsi_osd_permissions_remove, tvb, offset, 2, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_remove, tvb, offset, 2, ENC_BIG_ENDIAN);
if(permissions&0x0400){
proto_item_append_text(tree, " REMOVE");
}
- proto_tree_add_item(tree, hf_scsi_osd_permissions_obj_mgmt, tvb, offset, 2, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_obj_mgmt, tvb, offset, 2, ENC_BIG_ENDIAN);
if(permissions&0x0200){
proto_item_append_text(tree, " OBJ_MGMT");
}
- proto_tree_add_item(tree, hf_scsi_osd_permissions_append, tvb, offset, 2, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_append, tvb, offset, 2, ENC_BIG_ENDIAN);
if(permissions&0x0100){
proto_item_append_text(tree, " APPEND");
}
- proto_tree_add_item(tree, hf_scsi_osd_permissions_dev_mgmt, tvb, offset, 2, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_dev_mgmt, tvb, offset, 2, ENC_BIG_ENDIAN);
if(permissions&0x0080){
proto_item_append_text(tree, " DEV_MGMT");
}
- proto_tree_add_item(tree, hf_scsi_osd_permissions_global, tvb, offset, 2, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_global, tvb, offset, 2, ENC_BIG_ENDIAN);
if(permissions&0x0040){
proto_item_append_text(tree, " GLOBAL");
}
- proto_tree_add_item(tree, hf_scsi_osd_permissions_pol_sec, tvb, offset, 2, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_pol_sec, tvb, offset, 2, ENC_BIG_ENDIAN);
if(permissions&0x0020){
proto_item_append_text(tree, " POL/SEC");
}
@@ -1140,8 +1140,8 @@ dissect_osd_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
offset+=3;
/* LSTCHG and ROOT flags */
- proto_tree_add_item(tree, hf_scsi_osd_list_flags_lstchg, tvb, offset, 1, 0);
- proto_tree_add_item(tree, hf_scsi_osd_list_flags_root, tvb, offset, 1, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_list_flags_lstchg, tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_scsi_osd_list_flags_root, tvb, offset, 1, ENC_BIG_ENDIAN);
is_root=tvb_get_guint8(tvb, offset)&0x01;
offset++;
@@ -1485,7 +1485,7 @@ static const true_false_string collection_fcr_tfs = {
static void
dissect_osd_collection_fcr(tvbuff_t *tvb, int offset, proto_tree *tree)
{
- proto_tree_add_item(tree, hf_scsi_osd_collection_fcr, tvb, offset, 1, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_collection_fcr, tvb, offset, 1, ENC_BIG_ENDIAN);
}
static void