diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-10-29 14:09:20 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-10-29 14:09:20 +0000 |
| commit | 0ad98563a24b8685545825aac889ef43bfc58809 (patch) | |
| tree | d44e5d34582bc2a05ba6be6bd8d818e9a813147f /epan/dissectors/packet-erldp.c | |
| parent | 86c145ecb33495023a7966030faab5a69a3067eb (diff) | |
| download | wireshark-0ad98563a24b8685545825aac889ef43bfc58809.tar.gz | |
From didier gautheron: remove redundant or use faster col_xxx functions
- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster.
- same for replace col_append_fstr and col_append_str
- remove col_clear() when it's redundant:
+ before a col_set/col_add if the dissector can't throw an exception.
- replace col_append() after a col_clear() with faster col_add... or col_set
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344
svn path=/trunk/; revision=52948
Diffstat (limited to 'epan/dissectors/packet-erldp.c')
| -rw-r--r-- | epan/dissectors/packet-erldp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c index 3db1c210d8..735507e263 100644 --- a/epan/dissectors/packet-erldp.c +++ b/epan/dissectors/packet-erldp.c @@ -455,13 +455,13 @@ static void dissect_erldp_handshake(tvbuff_t *tvb, packet_info *pinfo, proto_tre offset += 4; proto_tree_add_item(tree, hf_erldp_digest, tvb, offset, 16, ENC_NA); /*offset += 16;*/ - col_add_str(pinfo->cinfo, COL_INFO, "SEND_CHALLENGE_REPLY"); + col_set_str(pinfo->cinfo, COL_INFO, "SEND_CHALLENGE_REPLY"); break; case 'a' : proto_tree_add_item(tree, hf_erldp_digest, tvb, offset, 16, ENC_NA); /*offset += 16;*/ - col_add_str(pinfo->cinfo, COL_INFO, "SEND_CHALLENGE_ACK"); + col_set_str(pinfo->cinfo, COL_INFO, "SEND_CHALLENGE_ACK"); break; case 's' : @@ -499,7 +499,7 @@ static void dissect_erldp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre offset += 4; if (msg_len == 0) { - col_add_str(pinfo->cinfo, COL_INFO, "KEEP_ALIVE"); + col_set_str(pinfo->cinfo, COL_INFO, "KEEP_ALIVE"); return; } @@ -525,7 +525,7 @@ static void dissect_erldp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre default: proto_tree_add_item(erldp_tree, hf_erldp_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - col_add_str(pinfo->cinfo, COL_INFO, "unknown header format"); + col_set_str(pinfo->cinfo, COL_INFO, "unknown header format"); return; } } |