From 8d78077d0d931c6afee6d0e27b5df7c5477e21e5 Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 4 Jun 2015 14:28:40 +0200 Subject: [MSVC2015] TRy to fix Warnings turned errors. Change-Id: I1156e66daad84004f4f7acae0175fcbb475db71a Reviewed-on: https://code.wireshark.org/review/8760 Reviewed-by: Anders Broman --- epan/dissectors/packet-btrfcomm.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'epan/dissectors/packet-btrfcomm.c') diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index eb6c92c226..be7bb17793 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -281,14 +281,9 @@ static void btrfcomm_serv_prompt(packet_info *pinfo, gchar* result) static gpointer btrfcomm_serv_value(packet_info *pinfo) { - gulong *value_data; - value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, BTRFCOMM_SERVICE_CONV); + return (gpointer)p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, BTRFCOMM_SERVICE_CONV); - if (value_data) - return (gpointer) *value_data; - - return NULL; } static void btrfcomm_chan_prompt(packet_info *pinfo, gchar* result) @@ -304,14 +299,9 @@ static void btrfcomm_chan_prompt(packet_info *pinfo, gchar* result) static gpointer btrfcomm_chan_value(packet_info *pinfo) { - gulong *value_data; - value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, BTRFCOMM_CHANNEL_CONV); + return (gpointer) p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, BTRFCOMM_CHANNEL_CONV); - if (value_data) - return (gpointer) *value_data; - - return NULL; } static dissector_handle_t -- cgit v1.2.1