diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-08-07 10:19:22 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-08-07 17:21:51 +0000 |
commit | 0a1d1bdb37b2b0857a0f237ac18f8998613e7ee0 (patch) | |
tree | e5c15ffc3a8403152861945485367a31515f8bc4 /epan/dissectors | |
parent | 147ab19f08cc47318cf032d23786b462872f3aa5 (diff) |
More casting issues with older versions of GLib.
Try to fix
packet-btl2cap.c: In function 'btl2cap_cid_value':
packet-btl2cap.c:425: warning: cast to pointer from integer of different size
packet-btl2cap.c: In function 'btl2cap_psm_value':
packet-btl2cap.c:448: warning: cast to pointer from integer of different size
packet-btrfcomm.c: In function 'btrfcomm_directed_channel_value':
packet-btrfcomm.c:287: warning: cast to pointer from integer of different size
packet-btobex.c: In function 'btobex_profile_value':
packet-btobex.c:1134: warning: cast to pointer from integer of different size
on the 32-bit OS X builder.
Change-Id: Ieb2fe6c31fdad0cf776c24bada7a6a83e8aa91ec
Reviewed-on: https://code.wireshark.org/review/9915
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-btl2cap.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-btobex.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-btrfcomm.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 80b43db3c2..5787b3180e 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -422,7 +422,7 @@ static gpointer btl2cap_cid_value(packet_info *pinfo) value_data = (guint16 *) p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, PROTO_DATA_BTL2CAP_CID); if (value_data) - return GUINT_TO_POINTER(*value_data); + return GUINT_TO_POINTER((gulong)*value_data); return NULL; } @@ -445,7 +445,7 @@ static gpointer btl2cap_psm_value(packet_info *pinfo) value_data = (guint16 *) p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, PROTO_DATA_BTL2CAP_PSM); if (value_data) - return GUINT_TO_POINTER(*value_data); + return GUINT_TO_POINTER((gulong)*value_data); return NULL; } diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index af4718939a..94fa73806a 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -1131,7 +1131,7 @@ static gpointer btobex_profile_value(packet_info *pinfo _U_) value_data = (guint8 *) p_get_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_BTOBEX_PROFILE); if (value_data) - return GUINT_TO_POINTER(*value_data); + return GUINT_TO_POINTER((gulong)*value_data); return NULL; } diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index bdd822ddb2..b887a28556 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -284,7 +284,7 @@ static gpointer btrfcomm_directed_channel_value(packet_info *pinfo) value_data = (guint8 *) p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, PROTO_DATA_BTRFCOMM_DIRECTED_CHANNEL); if (value_data) - return GUINT_TO_POINTER(*value_data); + return GUINT_TO_POINTER((gulong)*value_data); return NULL; } |