diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2015-08-06 10:59:51 +0200 |
|---|---|---|
| committer | Michal Labedzki <michal.labedzki@tieto.com> | 2015-08-06 09:57:25 +0000 |
| commit | 8906e9309606b575f3e895a301b8d8b5d8d1b0d8 (patch) | |
| tree | c105ec4d8e7568d8bc8f557481f405155c7d00df /epan/dissectors/packet-btrfcomm.c | |
| parent | b4dea54206b0e25598aa99426ccb565ac6f059a6 (diff) | |
Bluetooth: Fix some MSVC2015 warnings/errors
packet-btobex.c(1134): error C2220: warning treated as error - no 'object' file generated
packet-btobex.c(1134): warning C4312: 'type cast': conversion from 'gulong' to ' gpointer' of greater size
packet-btatt.c(1420): error C2220: warning treated as error - no 'object' file generated
packet-btatt.c(1420): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size
packet-btatt.c(1443): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size
packet-btl2cap.c(425): error C2220: warning treated as error - no 'object' file generated
packet-btl2cap.c(425): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size
packet-btl2cap.c(448): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size
packet-btrfcomm.c(287): error C2220: warning treated as error - no 'object' file generated
packet-btrfcomm.c(287): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size
Change-Id: Ie5b4fd1c47725b966f9b98d9480c1858b553efff
Reviewed-on: https://code.wireshark.org/review/9894
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'epan/dissectors/packet-btrfcomm.c')
| -rw-r--r-- | epan/dissectors/packet-btrfcomm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index f6e5143b11..bdd822ddb2 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -268,9 +268,9 @@ void proto_reg_handoff_btgnss(void); static void btrfcomm_directed_channel_prompt(packet_info *pinfo, gchar* result) { - gulong *value_data; + guint8 *value_data; - value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, PROTO_DATA_BTRFCOMM_DIRECTED_CHANNEL); + value_data = (guint8 *) p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, PROTO_DATA_BTRFCOMM_DIRECTED_CHANNEL); if (value_data) g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "RFCOMM Channel %d (direction: %u) as", (guint) (*value_data) >> 1, (guint) (*value_data) & 1); else @@ -279,12 +279,12 @@ static void btrfcomm_directed_channel_prompt(packet_info *pinfo, gchar* result) static gpointer btrfcomm_directed_channel_value(packet_info *pinfo) { - gulong *value_data; + guint8 *value_data; - value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, PROTO_DATA_BTRFCOMM_DIRECTED_CHANNEL); + value_data = (guint8 *) p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, PROTO_DATA_BTRFCOMM_DIRECTED_CHANNEL); if (value_data) - return (gpointer) *value_data; + return GUINT_TO_POINTER(*value_data); return NULL; } @@ -468,9 +468,9 @@ dissect_btrfcomm_address(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tr proto_item_append_text(dlci_item, " (Direction: %d, Channel: %u)", dlci & 0x01, channel); if (p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, PROTO_DATA_BTRFCOMM_DIRECTED_CHANNEL) == NULL) { - gulong *value_data; + guint8 *value_data; - value_data = wmem_new(wmem_file_scope(), gulong); + value_data = wmem_new(wmem_file_scope(), guint8); *value_data = dlci; p_add_proto_data(pinfo->pool, pinfo, proto_btrfcomm, PROTO_DATA_BTRFCOMM_DIRECTED_CHANNEL, value_data); |