diff options
| author | Anders <anders.broman@ericsson.com> | 2015-06-04 14:28:40 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-06-04 13:32:17 +0000 |
| commit | 8d78077d0d931c6afee6d0e27b5df7c5477e21e5 (patch) | |
| tree | b8f95e3205d242512acdf6407126815ded24dd5c /epan/dissectors/packet-btl2cap.c | |
| parent | 539418c91732b71985117a01e1db42436baa83cc (diff) | |
[MSVC2015] TRy to fix Warnings turned errors.
Change-Id: I1156e66daad84004f4f7acae0175fcbb475db71a
Reviewed-on: https://code.wireshark.org/review/8760
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-btl2cap.c')
| -rw-r--r-- | epan/dissectors/packet-btl2cap.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 712bc2418c..cb7c36f3f1 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -419,14 +419,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, BTL2CAP_CID_CONV); - if (value_data) - return (gpointer) *value_data; + return (gpointer)p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, BTL2CAP_CID_CONV); - return NULL; } static void btl2cap_psm_prompt(packet_info *pinfo, gchar* result) @@ -442,14 +437,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, BTL2CAP_PSM_CONV); - if (value_data) - return (gpointer) *value_data; + return (gpointer) p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, BTL2CAP_PSM_CONV); - return NULL; } static void btl2cap_serv_prompt(packet_info *pinfo, gchar* result) @@ -465,14 +455,9 @@ static void btl2cap_serv_prompt(packet_info *pinfo, gchar* result) static gpointer btl2cap_serv_value(packet_info *pinfo) { - gulong *value_data; - value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, BTL2CAP_SERV_CONV); - - if (value_data) - return (gpointer) *value_data; + return (gpointer) p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, BTL2CAP_SERV_CONV); - return NULL; } static guint16 |