diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2014-06-04 09:25:25 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-04 07:27:16 +0000 |
| commit | c44c15363fdfa5b75764d3c54277a439c8b8f1c7 (patch) | |
| tree | e8f25981dba4be81b1dd07bd5d1dd19de4c32230 /epan | |
| parent | f0cf649b3265c915e4e11aeac5ecd76ada03c46c (diff) | |
| download | wireshark-c44c15363fdfa5b75764d3c54277a439c8b8f1c7.tar.gz | |
Try to please the OSX build bot
Change-Id: I4c7d5c6b91df2baae74f6970d0e333346be47238
Reviewed-on: https://code.wireshark.org/review/1944
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-epl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 790dea668a..5c6f85c1b1 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -2734,7 +2734,7 @@ dissect_epl_sdo_command_write_multiple_by_index(proto_tree *epl_tree, tvbuff_t * { gint dataoffset; guint8 subindex = 0x00, padding = 0x00; - guint16 index = 0x00; + guint16 idx = 0x00; guint32 size, offsetincrement, datalength, remlength; gboolean lastentry = FALSE; proto_item *psf_item; @@ -2807,16 +2807,16 @@ dissect_epl_sdo_command_write_multiple_by_index(proto_tree *epl_tree, tvbuff_t * if (segmented <= EPL_ASND_SDO_CMD_SEGMENTATION_INITIATE_TRANSFER) { - index = tvb_get_letohs(tvb, dataoffset); + idx = tvb_get_letohs(tvb, dataoffset); psf_item = proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_data_index, tvb, dataoffset, 2, ENC_LITTLE_ENDIAN); - proto_item_append_text(psf_item," (%s)", val_to_str_ext_const(((guint32)(index<<16)), &sod_index_names, "User Defined")); - col_append_fstr(pinfo->cinfo, COL_INFO, " [%s", val_to_str_ext_const(((guint32) (index << 16)), &sod_index_names, "User Defined")); + proto_item_append_text(psf_item," (%s)", val_to_str_ext_const(((guint32)(idx<<16)), &sod_index_names, "User Defined")); + col_append_fstr(pinfo->cinfo, COL_INFO, " [%s", val_to_str_ext_const(((guint32) (idx << 16)), &sod_index_names, "User Defined")); dataoffset += 2; subindex = tvb_get_guint8(tvb, dataoffset); psf_item = proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_data_subindex, tvb, dataoffset, 1, ENC_LITTLE_ENDIAN); - proto_item_append_text(psf_item, " (%s)", val_to_str_ext_const((subindex|(index<<16)), &sod_index_names, "User Defined")); - col_append_fstr(pinfo->cinfo, COL_INFO, " | %s]",val_to_str_ext_const((subindex|(index<<16)), &sod_index_names, "User Defined")); + proto_item_append_text(psf_item, " (%s)", val_to_str_ext_const((subindex|(idx<<16)), &sod_index_names, "User Defined")); + col_append_fstr(pinfo->cinfo, COL_INFO, " | %s]",val_to_str_ext_const((subindex|(idx<<16)), &sod_index_names, "User Defined")); dataoffset += 1; proto_tree_add_uint(epl_tree, hf_epl_asnd_sdo_cmd_data_padding, tvb, dataoffset, 1, padding); |