aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-btrfcomm.c
diff options
context:
space:
mode:
authorAndersBroman <anders.broman@ericsson.com>2015-08-05 14:37:20 +0200
committerAnders Broman <a.broman58@gmail.com>2015-08-05 12:40:36 +0000
commit2221153a9cc083a50248a72a4b4009908d84e38b (patch)
treed2863e912e4bee4a6852e35eb8a6f4c5c6dd7bd1 /epan/dissectors/packet-btrfcomm.c
parent5de487aa78aa6ae4fe1af991f6ce536d2ff5b5f6 (diff)
[MSVC 2015] Fix errors seen with the released version by reverting the
code to what failed on the RC version *sigh* Change-Id: I1b7f6d57da4cb71473a074291da7e5a0d5242c95 Reviewed-on: https://code.wireshark.org/review/9874 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-btrfcomm.c')
-rw-r--r--epan/dissectors/packet-btrfcomm.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c
index f6e5143b11..c6d212e036 100644
--- a/epan/dissectors/packet-btrfcomm.c
+++ b/epan/dissectors/packet-btrfcomm.c
@@ -279,14 +279,9 @@ static void btrfcomm_directed_channel_prompt(packet_info *pinfo, gchar* result)
static gpointer btrfcomm_directed_channel_value(packet_info *pinfo)
{
- gulong *value_data;
- value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, PROTO_DATA_BTRFCOMM_DIRECTED_CHANNEL);
+ return (gpointer)p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, PROTO_DATA_BTRFCOMM_DIRECTED_CHANNEL);
- if (value_data)
- return (gpointer) *value_data;
-
- return NULL;
}
static dissector_handle_t