diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2007-04-13 00:50:23 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2007-04-13 00:50:23 +0000 |
| commit | f002ac6db5099393872c7e041f78c85e95581195 (patch) | |
| tree | 9a8c65d28fe753b2b56ab7b0bc138bbd074ab817 /epan/dissectors/packet-scsi.c | |
| parent | 5f5f6561084a292b10f2712236aed087799167f2 (diff) | |
Fix various warnings
Move packet-cops.c out of clean dissectors due to a #define conflict
in the headers of net-snmp with our config.h
svn path=/trunk/; revision=21398
Diffstat (limited to 'epan/dissectors/packet-scsi.c')
| -rw-r--r-- | epan/dissectors/packet-scsi.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 34cf836fec..253848581f 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -2036,9 +2036,10 @@ dissect_spc_inq_reladrflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree) } void -dissect_spc_inquiry (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, - guint offset, gboolean isreq, gboolean iscdb, - guint32 payload_len, scsi_task_data_t *cdata) +dissect_spc_inquiry (tvbuff_t *volatile tvb, packet_info *pinfo, + proto_tree *tree, volatile guint offset, gboolean isreq, + gboolean iscdb, guint32 payload_len, + scsi_task_data_t *cdata) { guint8 flags, i; static const int *peripheal_fields[] = { @@ -3798,9 +3799,10 @@ proto_tree *tree _U_, } void -dissect_spc_reportluns (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, - guint offset, gboolean isreq, gboolean iscdb, - guint payload_len _U_, scsi_task_data_t *cdata _U_) +dissect_spc_reportluns (tvbuff_t *volatile tvb, packet_info *pinfo _U_, + proto_tree *tree, volatile guint offset, + gboolean isreq, gboolean iscdb, guint payload_len _U_, + scsi_task_data_t *cdata _U_) { guint8 flags; gint listlen; |