From e92086849af8e8611ec2e789aa33a4734ff4208b Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Sun, 12 Jul 2015 20:04:14 +0000 Subject: [PATCH] Revert "[MSVC2015] TRy to fix Warnings turned errors." This reverts commit 8d78077d0d931c6afee6d0e27b5df7c5477e21e5. Reverted as requested. Change-Id: I99461820d28215a52cc6bae6792f2892018d28b8 Reviewed-on: https://code.wireshark.org/review/9609 Reviewed-by: Anders Broman --- epan/dissectors/packet-btatt.c | 14 ++++++++++++-- epan/dissectors/packet-btavctp.c | 7 ++++++- epan/dissectors/packet-btl2cap.c | 21 ++++++++++++++++++--- epan/dissectors/packet-btobex.c | 7 ++++++- epan/dissectors/packet-btrfcomm.c | 14 ++++++++++++-- epan/dissectors/packet-h223.c | 2 +- 6 files changed, 55 insertions(+), 10 deletions(-) diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index 73d8a649a6..0d30cb8113 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -1412,9 +1412,14 @@ static void btatt_handle_prompt(packet_info *pinfo, gchar* result) static gpointer btatt_handle_value(packet_info *pinfo) { + gulong *value_data; - return (gpointer) p_get_proto_data(pinfo->pool, pinfo, proto_btatt, PROTO_DATA_BTATT_HANDLE); + value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btatt, PROTO_DATA_BTATT_HANDLE); + if (value_data) + return (gpointer) *value_data; + + return NULL; } static void btatt_uuid16_prompt(packet_info *pinfo, gchar* result) @@ -1430,9 +1435,14 @@ static void btatt_uuid16_prompt(packet_info *pinfo, gchar* result) static gpointer btatt_uuid16_value(packet_info *pinfo) { + gulong *value_data; - return (gpointer) p_get_proto_data(pinfo->pool, pinfo, proto_btatt, PROTO_DATA_BTATT_UUID16); + value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btatt, PROTO_DATA_BTATT_UUID16); + if (value_data) + return (gpointer) *value_data; + + return NULL; } static void btatt_uuid128_prompt(packet_info *pinfo, gchar* result) diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c index 717f28cef3..390900ea65 100644 --- a/epan/dissectors/packet-btavctp.c +++ b/epan/dissectors/packet-btavctp.c @@ -116,9 +116,14 @@ static void btavctp_pid_prompt(packet_info *pinfo, gchar* result) static gpointer btavctp_pid_value(packet_info *pinfo) { + gulong *value_data; + + value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btavctp, BTAVCTP_PID_CONV); - return (gpointer) p_get_proto_data(pinfo->pool, pinfo, proto_btavctp, BTAVCTP_PID_CONV); + if (value_data) + return (gpointer) *value_data; + return NULL; } static gint diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index cb7c36f3f1..712bc2418c 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -419,9 +419,14 @@ 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); - return (gpointer)p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, BTL2CAP_CID_CONV); + if (value_data) + return (gpointer) *value_data; + return NULL; } static void btl2cap_psm_prompt(packet_info *pinfo, gchar* result) @@ -437,9 +442,14 @@ 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); - return (gpointer) p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, BTL2CAP_PSM_CONV); + if (value_data) + return (gpointer) *value_data; + return NULL; } static void btl2cap_serv_prompt(packet_info *pinfo, gchar* result) @@ -455,9 +465,14 @@ static void btl2cap_serv_prompt(packet_info *pinfo, gchar* result) static gpointer btl2cap_serv_value(packet_info *pinfo) { + gulong *value_data; - return (gpointer) p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, BTL2CAP_SERV_CONV); + value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, BTL2CAP_SERV_CONV); + + if (value_data) + return (gpointer) *value_data; + return NULL; } static guint16 diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 096a6d318d..e6799c8e03 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -1126,9 +1126,14 @@ static void btobex_profile_prompt(packet_info *pinfo _U_, gchar* result) static gpointer btobex_profile_value(packet_info *pinfo _U_) { + gulong *value_data; - return (gpointer)p_get_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_BTOBEX_PROFILE); + value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_BTOBEX_PROFILE); + if (value_data) + return (gpointer) *value_data; + + return NULL; } static void diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index be7bb17793..eb6c92c226 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -281,9 +281,14 @@ static void btrfcomm_serv_prompt(packet_info *pinfo, gchar* result) static gpointer btrfcomm_serv_value(packet_info *pinfo) { + gulong *value_data; - return (gpointer)p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, BTRFCOMM_SERVICE_CONV); + value_data = (gulong *) 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) @@ -299,9 +304,14 @@ static void btrfcomm_chan_prompt(packet_info *pinfo, gchar* result) static gpointer btrfcomm_chan_value(packet_info *pinfo) { + gulong *value_data; - return (gpointer) p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, BTRFCOMM_CHANNEL_CONV); + value_data = (gulong *) 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 diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index c45d492de6..2c0553f8e6 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -193,7 +193,7 @@ static guint circuit_chain_hash (gconstpointer v) { const circuit_chain_key *key = (const circuit_chain_key *)v; - guint hash_val = (GPOINTER_TO_UINT(key->call))^(((guint32)key->vc) << 16); + guint hash_val = ((guint32)(unsigned long)(key->call))^(((guint32)key->vc) << 16); return hash_val; } -- 2.34.1