aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-jxta.c
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2016-08-12 12:29:28 +0200
committerMichael Mann <mmann78@netscape.net>2016-08-13 21:49:09 +0000
commit854793d48ed1d1645e44c42a9c1cdfea38f90bf5 (patch)
tree32ec64113d11ec588c9d5a4db22fee5c154c9551 /epan/dissectors/packet-jxta.c
parent620f5721b176ab4cd0cd87ec618925c91664f2ee (diff)
jxta: remove dead code (CID 1159018).
Check already present in line 1226. Change-Id: I2b3cd15a1d35b334a690afd3ce1a9b8b1f32e188 Reviewed-on: https://code.wireshark.org/review/17029 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-jxta.c')
-rw-r--r--epan/dissectors/packet-jxta.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c
index 3201774d75..a0ea257cce 100644
--- a/epan/dissectors/packet-jxta.c
+++ b/epan/dissectors/packet-jxta.c
@@ -1288,13 +1288,10 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree
tvbuff_t *jxta_message_element_tvb = tvb_new_subset_remaining(tvb, offset);
int processed;
- if(JXTA_MSG_VERSION_1 == message_version) {
+ if (JXTA_MSG_VERSION_1 == message_version) {
processed = dissect_jxta_message_element_1(jxta_message_element_tvb, pinfo, NULL, 0, NULL);
- } else if(JXTA_MSG_VERSION_2 == message_version) {
+ } else { /* JXTA_MSG_VERSION_2 */
processed = dissect_jxta_message_element_2(jxta_message_element_tvb, pinfo, NULL, 0, NULL);
- } else {
- /* Sort of a lie, we say that we don't recognize it at all. */
- return 0;
}
if (processed < 0) {