diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-03-01 05:29:12 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-03-01 05:29:12 +0000 |
| commit | f9bc424a05eaefb49f27833454e8fc00e6e10c4d (patch) | |
| tree | bd4d80b77d9d62a4b3567d15d8b2bb09a9eba671 /epan/dissectors/packet-cisco-erspan.c | |
| parent | 595a6d4504cec0abac6c8d67dde05a293eff5ec7 (diff) | |
Fix Coverity CID 280362: Logically dead code.
#BACKPORT (1.8, 1.6)
svn path=/trunk/; revision=47965
Diffstat (limited to 'epan/dissectors/packet-cisco-erspan.c')
| -rw-r--r-- | epan/dissectors/packet-cisco-erspan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c index 6a12782807..c1ac42e325 100644 --- a/epan/dissectors/packet-cisco-erspan.c +++ b/epan/dissectors/packet-cisco-erspan.c @@ -126,7 +126,7 @@ dissect_erspan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *erspan_tree = NULL; tvbuff_t *eth_tvb; guint32 offset = 0; - guint16 version = 0; + guint16 version; col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME); col_set_str(pinfo->cinfo, COL_INFO, PROTO_SHORT_NAME ":"); @@ -145,8 +145,9 @@ dissect_erspan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } + + version = tvb_get_ntohs(tvb, offset) >> 12; if (tree) { - version = tvb_get_ntohs(tvb, offset) >> 12; ti_ver = proto_tree_add_item(erspan_tree, hf_erspan_version, tvb, offset, 2, ENC_BIG_ENDIAN); if ((version != 1) && (version != 2 )) { |