aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-scsi.c
diff options
context:
space:
mode:
authorMartin Mathieson <martin.r.mathieson@googlemail.com>2013-12-23 15:25:05 +0000
committerMartin Mathieson <martin.r.mathieson@googlemail.com>2013-12-23 15:25:05 +0000
commitf687bd18daad271c59c20f56dfcf9e53047ccc71 (patch)
treebb8e24adac3c8bac37b66384134ec776e31f9990 /epan/dissectors/packet-scsi.c
parent00048cf418e4af9472c46e51d1cdc8294283aeea (diff)
Change types to try to avoid warnings.
svn path=/trunk/; revision=54385
Diffstat (limited to 'epan/dissectors/packet-scsi.c')
-rw-r--r--epan/dissectors/packet-scsi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index 60b3bb1783..93c810e7cc 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -3309,7 +3309,8 @@ dissect_spc_extcopy(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
gboolean isreq _U_, gboolean iscdb _U_,
guint payload_len _U_, scsi_task_data_t *cdata _U_)
{
- guint8 serv_action, cscd_desc_type, dev_type, des_len, code_set, des_type, seg_type;
+ guint16 serv_action;
+ guint8 cscd_desc_type, dev_type, des_len, code_set, des_type, seg_type;
guint16 cscd_desc_list_len, seg_desc_len;
guint32 param_list_len, seg_desc_list_len, inline_data_len, i;
proto_tree *cscds_tree = NULL, *dev_tree = NULL, *cscd_tree = NULL, *segs_tree = NULL, *seg_tree = NULL, *seg_param_tree = NULL;
@@ -3474,7 +3475,8 @@ void dissect_spc_recvcopy(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
gboolean isreq _U_, gboolean iscdb _U_,
guint payload_len _U_, scsi_task_data_t *cdata _U_)
{
- guint8 serv_action, imp_desc_list_len;
+ guint16 serv_action;
+ guint8 imp_desc_list_len;
if (isreq && iscdb) {
proto_tree_add_item(tree, hf_scsi_spc_recv_copy_service, tvb, offset, 1, ENC_NA);