diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-03-11 15:19:16 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-03-13 00:06:10 +0000 |
| commit | c70927c0e11a251aec14bc3bb391cd18cacba6db (patch) | |
| tree | f449f6c59dcb5917c25f5786ec260608b16e0ae0 | |
| parent | eab8050fdd8ea43d75a6fd3d86211628b6e1d1aa (diff) | |
| download | wireshark-c70927c0e11a251aec14bc3bb391cd18cacba6db.tar.gz | |
erf: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
Change-Id: I1634b0a7b0fa35ea59ef2fc7fbe0b81f77aad978
Reviewed-on: https://code.wireshark.org/review/20508
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
| -rw-r--r-- | epan/dissectors/packet-erf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index 7e11967b05..bfcb930835 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -2392,7 +2392,7 @@ dissect_meta_record_tags(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { tag_tree = proto_tree_add_subtree(section_tree, tvb, offset + 4, taglength, tag_info->ett, &tag_pi, tag_info->tag_template->hfinfo.name); /* Address */ - pi = proto_tree_add_item(tag_tree, tag_info->extra->hf_values[0], tvb, offset + 4, MIN(addr_len, taglength), IS_FT_INT(tag_ft) || IS_FT_UINT(tag_ft) ? ENC_BIG_ENDIAN : ENC_NA); + pi = proto_tree_add_item(tag_tree, tag_info->extra->hf_values[0], tvb, offset + 4, MIN(addr_len, taglength), ENC_BIG_ENDIAN); /* Name */ proto_tree_add_item(tag_tree, tag_info->extra->hf_values[1], tvb, offset + 4 + addr_len, taglength - addr_len, ENC_UTF_8); if (pi) { |