From 4b7700db4b4a352db05e59e48cb729045e805295 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Mon, 1 Jan 2018 14:11:26 -0500 Subject: LNET: Fix gcc 7 compiler complaints Change-Id: Idad6411139226cb6694b8dad5cb2107882f90848 Reviewed-on: https://code.wireshark.org/review/25102 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-lnet.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/epan/dissectors/packet-lnet.c b/epan/dissectors/packet-lnet.c index 97bfba3014..06b3be923f 100644 --- a/epan/dissectors/packet-lnet.c +++ b/epan/dissectors/packet-lnet.c @@ -387,13 +387,10 @@ dissect_csum(tvbuff_t * tvb, packet_info *pinfo, proto_tree *tree, int offset, g { guint32 csum; proto_item *ti; - gboolean error = FALSE; csum = tvb_get_letohl(tvb, offset); // @@ convert this to proto_tree_add_checksum() switch (lnd_type) { - default: - error = TRUE; case SOCKLND: ti = proto_tree_add_item(tree, hf_lnet_ib_csum, tvb, offset, 4, ENC_LITTLE_ENDIAN); break; @@ -401,11 +398,12 @@ dissect_csum(tvbuff_t * tvb, packet_info *pinfo, proto_tree *tree, int offset, g case O2IBLND: ti = proto_tree_add_item(tree, hf_lnet_ksm_csum, tvb, offset, 4, ENC_LITTLE_ENDIAN); break; - } - if (error) - expert_add_info_format(pinfo, ti, &ei_lnet_type, "Checksum for unprocessed type: %s", + default: + expert_add_info_format(pinfo, NULL, &ei_lnet_type, "Checksum for unprocessed type: %s", val_to_str(lnd_type, lndnames, "Unknown(%d)")); + break; + } if (csum == 0) proto_item_append_text(ti, " (DISABLED)"); -- cgit v1.2.3