diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-18 23:16:10 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-18 23:16:10 +0000 |
| commit | 000296b31cb5e8580d54f2966575ff5b8a29781e (patch) | |
| tree | dc072ea64d05386e4ee2e0239b9cf90f63272e20 /epan/dissectors/packet-mq.c | |
| parent | b6f93b0c209f5aea2c8e8b1453588e04fb9127bb (diff) | |
Fix some gcc -Wshadow warnings ....
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31559 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-mq.c')
| -rw-r--r-- | epan/dissectors/packet-mq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index 0eeda8b46d..f1b26c4401 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -1237,7 +1237,7 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 opcode; guint32 iSegmentLength = 0; guint32 iSizePayload = 0; - gint iSizeMD = 0; + gint iSizeMD_gbl = 0; gboolean bLittleEndian = FALSE; gboolean bPayload = FALSE; gboolean bEBCDIC = FALSE; @@ -2006,11 +2006,11 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 4; structId = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL; } - if ((iSizeMD = dissect_mq_md(tvb, mqroot_tree, bLittleEndian, offset, &tMsgProps)) != 0) + if ((iSizeMD_gbl = dissect_mq_md(tvb, mqroot_tree, bLittleEndian, offset, &tMsgProps)) != 0) { gint iSizeGMO = 0; gint iSizePMO = 0; - offset += iSizeMD; + offset += iSizeMD_gbl; if ((iSizeGMO = dissect_mq_gmo(tvb, pinfo, mqroot_tree, bLittleEndian, offset)) != 0) { |