diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-07-30 02:09:59 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-07-30 02:09:59 +0000 |
| commit | 5c78208855fc31b90d0e18956eb8f82ff5c8e909 (patch) | |
| tree | e96a358bba5aa115f22ae12b308d7a725719e23f /epan/dissectors/packet-scsi.c | |
| parent | e87d4d257b465d7ab8f2223d92ac6cc6192ae1b6 (diff) | |
Widen a variable, as a guint16 value is assigned to it; the upper 8 bits
might be irrelevant in this case, but we might as well not throw them
out.
Clean up some code that sets "cdata->flags".
svn path=/trunk/; revision=15149
Diffstat (limited to 'epan/dissectors/packet-scsi.c')
| -rw-r--r-- | epan/dissectors/packet-scsi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index cd56ca88dc..dff4f51096 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -3063,7 +3063,7 @@ dissect_spc3_persistentreservein (tvbuff_t *tvb, packet_info *pinfo _U_, proto_t guint offset, gboolean isreq, gboolean iscdb, guint payload_len, scsi_task_data_t *cdata) { - guint8 flags; + guint16 flags; int numrec, i; guint len; @@ -3865,11 +3865,9 @@ dissect_mmc4_readtocpmaatip (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * char *str; if (tree && isreq && iscdb) { - cdata->flags=0; - format=tvb_get_guint8(tvb, offset+1)&0x0f; /* save format so we can decode the response */ - cdata->flags|=format; + cdata->flags=format; switch(format){ case 0x00: |