diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-11-28 20:40:46 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-11-28 20:40:46 +0000 |
| commit | 710feed2e01326cd37c4d981fb42456bf31afa9f (patch) | |
| tree | 1b1009a8e20767e05f2d97a9bf633eef9ef62bdc /epan/dissectors/packet-usb.c | |
| parent | a31d10208b18a464aa686a07bffeb0bb2a48fe43 (diff) | |
GUINT_TO_POINTER() does just enough casting to suppress complaints about
32-bit integers and 64-bit pointers, so it needs to be handed a guint
(or equivalent type); it doesn't suppress warnings about 8-bit or 16-bit
integers, so those have to be cast up to guint first.
svn path=/trunk/; revision=53630
Diffstat (limited to 'epan/dissectors/packet-usb.c')
| -rw-r--r-- | epan/dissectors/packet-usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 84057f6998..f59667df7b 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -3439,8 +3439,8 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, device_product_data = (device_product_data_t *) wmem_tree_lookup32_array_le(device_to_product_table, key); if (device_product_data && device_product_data->bus_id == bus_id && device_product_data->device_address == device_address) { - p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_VENDOR_ID, GUINT_TO_POINTER(device_product_data->vendor)); - p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_PRODUCT_ID, GUINT_TO_POINTER(device_product_data->product)); + p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_VENDOR_ID, GUINT_TO_POINTER((guint)device_product_data->vendor)); + p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_PRODUCT_ID, GUINT_TO_POINTER((guint)device_product_data->product)); } else { device_product_data = NULL; } |