diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-04-04 15:57:29 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-04-04 15:57:29 +0000 |
| commit | 38a02b35ad728035d46b06111628e734373f38a1 (patch) | |
| tree | a154f08afa428ae2158edb5fd2d0b224b3b66b01 | |
| parent | e08b7c3a383eaa499663cfa6af51e2bb8ac07b88 (diff) | |
| download | wireshark-38a02b35ad728035d46b06111628e734373f38a1.tar.gz | |
Fix the 2nd occurrence of Coverity CID 280417: Logically dead code. This, plus r48657, should resolve the CID.
svn path=/trunk/; revision=48733
| -rw-r--r-- | epan/dissectors/packet-v5ua.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index e36a2d9123..45cd9aa1cf 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -288,30 +288,23 @@ dissect_dlci_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot else if (dlci_efa == 8179) { col_append_str(pinfo->cinfo, COL_INFO, " | ProtProt"); } else if (dlci_efa == 8180) { col_append_str(pinfo->cinfo, COL_INFO, " | LinkCtrl"); } - if(efa <= 8175) { - + if (efa <= 8175) { proto_tree_add_uint_format(parameter_tree, hf_efa, parameter_tvb, offset, EFA_LENGTH, efa, "Envelope function address: ISDN (%u)", efa); proto_item_append_text(parameter_item, " (SAPI:%u TEI:%u EFA:ISDN (%u))",sapi,tei,efa); } else if (efa > 8175 && efa <= 8180){ - proto_tree_add_uint_format(parameter_tree, hf_efa, parameter_tvb, offset, EFA_LENGTH, efa, "Envelope function address: %s (%u)", val_to_str_const(efa, efa_values, "unknown EFA"),tvb_get_ntohs(parameter_tvb, offset)); proto_item_append_text(parameter_item, " (SAPI:%u TEI:%u EFA:%s (%u))",sapi,tei,val_to_str_const(efa, efa_values, "unknown EFA-value"),efa); } - else if(efa >= 8181){ + else { proto_tree_add_uint_format(parameter_tree, hf_efa, parameter_tvb, offset, EFA_LENGTH, efa, "Envelope function address: RESERVED (%u)", efa); proto_item_append_text(parameter_item, " (SAPI:%u TEI:%u EFA:RESERVED (%u))",sapi,tei,efa); } - else { - proto_tree_add_uint_format(parameter_tree, hf_efa, parameter_tvb, offset, EFA_LENGTH, efa, - "Envelope function address: %u", efa); - proto_item_append_text(parameter_item, " (SAPI:%u TEI:%u EFA:%u)",sapi,tei,efa); - } } } /*----------------------DLCI & Envelope Function Address------------------------*/ |