osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Revert "[MSVC2015] TRy to fix Warnings turned errors." 

This reverts commit 8d78077d0d.

Reverted as requested.

Change-Id: I99461820d28215a52cc6bae6792f2892018d28b8
Reviewed-on: https://code.wireshark.org/review/9609
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Anders Broman 2015-07-12 20:04:14 +00:00
parent 39a2d9468b
commit e92086849a
6 changed files with 55 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-btatt.c
View File

@ -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)

7
epan/dissectors/packet-btavctp.c
View File

@ -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;
return (gpointer) p_get_proto_data(pinfo->pool, pinfo, proto_btavctp, BTAVCTP_PID_CONV);
value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btavctp, BTAVCTP_PID_CONV);
if (value_data)
return (gpointer) *value_data;
return NULL;
}
static gint

21
epan/dissectors/packet-btl2cap.c
View File

@ -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;
return (gpointer)p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, BTL2CAP_CID_CONV);
value_data = (gulong *) 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;
return (gpointer) p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, BTL2CAP_PSM_CONV);
value_data = (gulong *) 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

7
epan/dissectors/packet-btobex.c
View File

@ -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

14
epan/dissectors/packet-btrfcomm.c
View File

@ -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

2
epan/dissectors/packet-h223.c
View File

@ -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;
}