diff options
| author | Bill Meier <wmeier@newsguy.com> | 2009-10-31 14:43:05 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2009-10-31 14:43:05 +0000 |
| commit | 7aafce28851c93836ec7a07ff929f1cfca53c75d (patch) | |
| tree | 03db6c58773c809526fbb074a1d0ce59de4f7306 /epan/dissectors/packet-usb-hid.c | |
| parent | 81d90598d813e69bf48251afce63fa394aa9fb4c (diff) | |
Register dissectors in proto_reg_handoff (not proto_register) in the standard manner;
Use col_add_fstr instead of col_clear/col_append-fstr.
svn path=/trunk/; revision=30782
Diffstat (limited to 'epan/dissectors/packet-usb-hid.c')
| -rw-r--r-- | epan/dissectors/packet-usb-hid.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index 5d9a104378..958abf0748 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -787,8 +787,7 @@ dissect_usb_hid_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBHID"); if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s", + col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s", val_to_str(usb_trans_info->request, setup_request_names_vals, "Unknown type %x"), is_request ? "Request" : "Response"); } @@ -1047,13 +1046,15 @@ proto_register_usb_hid(void) &ett_usb_hid_wValue }; - dissector_handle_t usb_hid_control_handle; - proto_usb_hid = proto_register_protocol("USB HID", "USBHID", "usbhid"); proto_register_field_array(proto_usb_hid, hf, array_length(hf)); proto_register_subtree_array(usb_hid_subtrees, array_length(usb_hid_subtrees)); +} + +void +proto_reg_handoff_usb_hid(void) { + dissector_handle_t usb_hid_control_handle; usb_hid_control_handle = new_create_dissector_handle(dissect_usb_hid_control, proto_usb_hid); dissector_add("usb.control", IF_CLASS_HID, usb_hid_control_handle); - } |