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

[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>
This commit is contained in:
AndersBroman 2015-08-05 14:37:20 +02:00 committed by Anders Broman
parent 5de487aa78
commit 2221153a9c
5 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1412,14 +1412,9 @@ static void btatt_handle_prompt(packet_info *pinfo, gchar* result)
static gpointer btatt_handle_value(packet_info *pinfo)
{
gulong *value_data;
value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btatt, PROTO_DATA_BTATT_HANDLE);
return (gpointer)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)
@ -1435,14 +1430,9 @@ static void btatt_uuid16_prompt(packet_info *pinfo, gchar* result)
static gpointer btatt_uuid16_value(packet_info *pinfo)
{
gulong *value_data;
value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btatt, PROTO_DATA_BTATT_UUID16);
return (gpointer)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)

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

@ -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);
return (gpointer)p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, PROTO_DATA_BTL2CAP_CID);
if (value_data)
return (gpointer) *value_data;
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);
return (gpointer)p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, PROTO_DATA_BTL2CAP_PSM);
if (value_data)
return (gpointer) *value_data;
return NULL;
}
static guint16

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

@ -1126,14 +1126,9 @@ static void btobex_profile_prompt(packet_info *pinfo _U_, gchar* result)
static gpointer btobex_profile_value(packet_info *pinfo _U_)
{
gulong *value_data;
value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_BTOBEX_PROFILE);
return (gpointer)p_get_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_BTOBEX_PROFILE);
if (value_data)
return (gpointer) *value_data;
return NULL;
}
static void

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

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

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 = ((guint32)(unsigned long)(key->call))^(((guint32)key->vc) << 16);
guint hash_val = (GPOINTER_TO_UINT(key->call)) ^ (((guint32)key->vc) << 16);
return hash_val;
}