diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-01-13 20:25:10 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-01-13 20:25:10 +0000 |
| commit | c4dd31cd8792c964cc6e0fa9bfc6ed03caa9aeb7 (patch) | |
| tree | 3f74d12b3e1f71d1d0116091ca8cddf53479683a /epan/dissectors/packet-usb.c | |
| parent | 37cb4333a449ef51fd9eab22b22713e4ba277f9b (diff) | |
| download | wireshark-c4dd31cd8792c964cc6e0fa9bfc6ed03caa9aeb7.tar.gz | |
From Didier Gautheron:
col_clear.diff
Remove calls to col_clear :
- called twice.
- before functions which also clear the column
- by replacing col_clear + col_append_xxx with col_add_xxx
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4394
svn path=/trunk/; revision=31517
Diffstat (limited to 'epan/dissectors/packet-usb.c')
| -rw-r--r-- | epan/dissectors/packet-usb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 7b319ece41..290689049d 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -1861,8 +1861,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, offset += 1; if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s Request", + col_add_fstr(pinfo->cinfo, COL_INFO, "%s Request", val_to_str(usb_trans_info->request, setup_request_names_vals, "Unknown type %x")); } @@ -1987,8 +1986,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, * dissector */ if (check_col(pinfo->cinfo, COL_INFO)) { - col_clear(pinfo->cinfo, COL_INFO); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s Response", + col_add_fstr(pinfo->cinfo, COL_INFO, "%s Response", val_to_str(usb_conv_info->usb_trans_info->request, setup_request_names_vals, "Unknown type %x")); } |