diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-06-27 16:15:30 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-06-27 16:15:30 +0000 |
| commit | f8e3822738c2c6c906c1927ebe88c639c766a725 (patch) | |
| tree | 4085507410fd9cdbc670acc4969542f1f47d2fb4 /epan/dissectors/packet-epl.c | |
| parent | 09868c5db59d18f97a59e41831cbe98eda84b082 (diff) | |
Fix some warnings reported by gcc -Wshadow ...
Fix some spacing in packet-dcom.c
svn path=/trunk/; revision=25618
Diffstat (limited to 'epan/dissectors/packet-epl.c')
| -rw-r--r-- | epan/dissectors/packet-epl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index a8cf493d97..68aedc85f4 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -1090,7 +1090,7 @@ gint dissect_epl_sdo_command(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, gint offset) { guint8 segmented, command_id; - gboolean response, abort; + gboolean response, abort_flag; guint32 abort_code; guint16 segment_size; @@ -1099,10 +1099,10 @@ dissect_epl_sdo_command(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, command_id = tvb_get_guint8(tvb, offset + 2); - abort = tvb_get_guint8(tvb, offset + 1) & EPL_ASND_SDO_CMD_ABORT_FILTER; + abort_flag = tvb_get_guint8(tvb, offset + 1) & EPL_ASND_SDO_CMD_ABORT_FILTER; /* test if CommandField == empty */ - if (command_id != 0 || abort) + if (command_id != 0 || abort_flag) { segmented = (tvb_get_guint8(tvb, offset + 1) & EPL_ASND_SDO_CMD_SEGMENTATION_FILTER) >> 4; response = tvb_get_guint8(tvb, offset + 1) & EPL_ASND_SDO_CMD_RESPONSE_FILTER; @@ -1144,7 +1144,7 @@ dissect_epl_sdo_command(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, offset += 4; } - if (abort) + if (abort_flag) { abort_code = tvb_get_letohl(tvb, offset); /* if AbortBit is set then print AbortMessage */ |