osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Another shadowing fix for abort(). 

Change-Id: I991bd24ab8b64bdfeae275941d79b716da3309f9
Reviewed-on: https://code.wireshark.org/review/21592
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2017-05-11 03:50:02 -07:00
parent 804d0cdfa3
commit 871a8a2ccc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-epl.c
View File

@ -3301,7 +3301,7 @@ dissect_epl_sdo_command_write_multiple_by_index(proto_tree *epl_tree, tvbuff_t *
guint8 subindex = 0x00, padding = 0x00;
guint16 idx = 0x00, sod_index = 0x00, nosub = 0x00 ,error = 0xFF, entries = 0x00, sub_val = 0x00;
guint32 size, offsetincrement, datalength, remlength, objectcnt, abort_code = 0;
gboolean lastentry = FALSE, abort = FALSE;
gboolean lastentry = FALSE, is_abort = FALSE;
const gchar *index_str, *sub_str, *sub_index_str;
proto_item *psf_item;
proto_tree *psf_tree, *psf_od_tree;
@ -3542,7 +3542,7 @@ dissect_epl_sdo_command_write_multiple_by_index(proto_tree *epl_tree, tvbuff_t *
while ( remlength > 0 )
{
if ((tvb_get_guint8 ( tvb, offset + 3 ) & 0x80) == 0x80)
abort = TRUE;
is_abort = TRUE;
/* add object subtree */
psf_od_tree = proto_tree_add_subtree(epl_tree, tvb, offset, 8, 0, NULL , "OD");
@ -3599,7 +3599,7 @@ dissect_epl_sdo_command_write_multiple_by_index(proto_tree *epl_tree, tvbuff_t *
dataoffset += 1;
if (abort)
if (is_abort)
{
abort_code = tvb_get_letohl(tvb, dataoffset);
@ -3608,7 +3608,7 @@ dissect_epl_sdo_command_write_multiple_by_index(proto_tree *epl_tree, tvbuff_t *
psf_item = proto_tree_add_item(psf_od_tree, hf_epl_sdo_multi_param_sub_abort, tvb, dataoffset, 4, ENC_LITTLE_ENDIAN);
proto_item_append_text(psf_item," (%s)", val_to_str_ext_const(abort_code, &sdo_cmd_abort_code_ext, "Unknown"));
abort = FALSE;
is_abort = FALSE;
}
objectcnt++;