diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-04-08 09:35:33 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-04-08 16:35:55 +0000 |
| commit | 3c13e983dad5f77f6b52db9bc624f51ca41ecbf7 (patch) | |
| tree | c280d32ddc0c7b0993b3e9f485400b1cf5baac29 /epan | |
| parent | 45f019249c70c67f879e09ccafe65c8498b89be4 (diff) | |
Squelch another warning; fix a place assuming 8-bit device IDs.
Change-Id: I0b2d30a7724f9493ef0388232f6c13751e707255
Reviewed-on: https://code.wireshark.org/review/1023
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan')
| -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 93bc849dc5..3fa74d9735 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -968,7 +968,7 @@ usb_device_prompt(packet_info *pinfo, gchar* result) static gpointer usb_device_value(packet_info *pinfo) { - guint32 value = GPOINTER_TO_UINT(p_get_proto_data(pinfo->pool, pinfo, proto_usb, USB_BUS_ID)) << 8; + guint32 value = GPOINTER_TO_UINT(p_get_proto_data(pinfo->pool, pinfo, proto_usb, USB_BUS_ID)) << 16; value |= GPOINTER_TO_UINT(p_get_proto_data(pinfo->pool, pinfo, proto_usb, USB_DEVICE_ADDRESS)); return GUINT_TO_POINTER(value); } @@ -3374,7 +3374,7 @@ dissect_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, } p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_BUS_ID, GUINT_TO_POINTER(bus_id)); - p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_DEVICE_ADDRESS, GUINT_TO_POINTER(device_address)); + p_add_proto_data(pinfo->pool, pinfo, proto_usb, USB_DEVICE_ADDRESS, GUINT_TO_POINTER((guint)device_address)); if (tvb_length_remaining(tvb, offset) > 0) { next_tvb = tvb_new_subset_remaining(tvb, offset); |