diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-05-11 03:07:28 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-05-11 10:08:07 +0000 |
| commit | 804d0cdfa362a0243ee2f24b39af87539983c954 (patch) | |
| tree | 6744c9a34427a066b4899ba1cc197b156565da7d /epan/dissectors/packet-epl.c | |
| parent | 1ecf3b6645924f242b040fe518071ea62fc16e0a (diff) | |
Squelch warning from some compilers.
Change-Id: Iacd5832e3b63fa24907423d2b7df40e81fafb0de
Reviewed-on: https://code.wireshark.org/review/21591
Reviewed-by: Guy Harris <guy@alum.mit.edu>
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 2a2d84ea65..c3e9660829 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -3633,7 +3633,7 @@ dissect_epl_sdo_command_read_multiple_by_index(proto_tree *epl_tree, tvbuff_t *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; - gboolean lastentry = FALSE, abort = FALSE; + gboolean lastentry = FALSE, is_abort = FALSE; const gchar *index_str, *sub_str, *sub_index_str; proto_item *psf_item, *psf_od_item; proto_tree *psf_tree, *psf_od_tree; @@ -3666,7 +3666,7 @@ dissect_epl_sdo_command_read_multiple_by_index(proto_tree *epl_tree, tvbuff_t *t padding = tvb_get_guint8 ( tvb, offset + 7 ) & 0x03; if ((tvb_get_guint8 ( tvb, offset + 7 ) & 0x80) == 0x80) - abort = TRUE; + is_abort = TRUE; datalength = offsetincrement - ( offset - EPL_SOA_EPLV_OFFSET ); /* An offset increment of zero usually indicates, that we are at the end @@ -3825,7 +3825,7 @@ dissect_epl_sdo_command_read_multiple_by_index(proto_tree *epl_tree, tvbuff_t *t } - if (abort) + if (is_abort) { proto_tree_add_item(psf_od_tree, hf_epl_asnd_sdo_cmd_sub_abort, tvb, dataoffset - 1, 1, ENC_LITTLE_ENDIAN); @@ -3836,7 +3836,7 @@ dissect_epl_sdo_command_read_multiple_by_index(proto_tree *epl_tree, tvbuff_t *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; } else { |