diff options
author | AndersBroman <anders.broman@ericsson.com> | 2015-08-05 14:37:20 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2015-08-05 12:40:36 +0000 |
commit | 2221153a9cc083a50248a72a4b4009908d84e38b (patch) | |
tree | d2863e912e4bee4a6852e35eb8a6f4c5c6dd7bd1 /epan/dissectors/packet-btl2cap.c | |
parent | 5de487aa78aa6ae4fe1af991f6ce536d2ff5b5f6 (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-btl2cap.c')
-rw-r--r-- | epan/dissectors/packet-btl2cap.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 051afc117c..a6f19cf1e2 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -417,14 +417,9 @@ static void btl2cap_cid_prompt(packet_info *pinfo, gchar* result) static gpointer btl2cap_cid_value(packet_info *pinfo) { - gulong *value_data; - - value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, PROTO_DATA_BTL2CAP_CID); - if (value_data) - return (gpointer) *value_data; + return (gpointer)p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, PROTO_DATA_BTL2CAP_CID); - return NULL; } static void btl2cap_psm_prompt(packet_info *pinfo, gchar* result) @@ -440,14 +435,9 @@ static void btl2cap_psm_prompt(packet_info *pinfo, gchar* result) static gpointer btl2cap_psm_value(packet_info *pinfo) { - gulong *value_data; - - value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, PROTO_DATA_BTL2CAP_PSM); - if (value_data) - return (gpointer) *value_data; + return (gpointer)p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, PROTO_DATA_BTL2CAP_PSM); - return NULL; } static guint16 |