diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-24 20:21:23 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-24 20:21:23 +0000 |
| commit | 00810ff19994509f4f8a080286ad43f5156e76c2 (patch) | |
| tree | 687e12b760b8702534057b7348f27994c86b617d /epan/dissectors/packet-dtls.c | |
| parent | 830dd8e8f05e39238b97857e161821a41ff985df (diff) | |
* Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards
svn path=/trunk/; revision=30127
Diffstat (limited to 'epan/dissectors/packet-dtls.c')
| -rw-r--r-- | epan/dissectors/packet-dtls.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 4b6b5b5ce3..436da6892f 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -447,8 +447,7 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * continuation data */ offset = tvb_length(tvb); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Continuation Data"); /* Set the protocol column */ @@ -602,8 +601,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, /* if we don't have a valid content_type, there's no sense * continuing any further */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Continuation Data"); + col_append_str(pinfo->cinfo, COL_INFO, "Continuation Data"); /* Set the protocol column */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTLS"); @@ -705,8 +703,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, switch (content_type) { case SSL_ID_CHG_CIPHER_SPEC: - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Change Cipher Spec"); + col_append_str(pinfo->cinfo, COL_INFO, "Change Cipher Spec"); dissect_dtls_change_cipher_spec(tvb, dtls_record_tree, offset, conv_version, content_type); break; @@ -758,8 +755,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, record_length, content_type, ssl, TRUE); /* show on info colum what we are decoding */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Application Data"); + col_append_str(pinfo->cinfo, COL_INFO, "Application Data"); if (!dtls_record_tree) break; @@ -805,8 +801,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, default: /* shouldn't get here since we check above for valid types */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Bad DTLS Content Type"); + col_append_str(pinfo->cinfo, COL_INFO, "Bad DTLS Content Type"); break; } offset += record_length; /* skip to end of record */ @@ -883,8 +878,7 @@ dissect_dtls_alert(tvbuff_t *tvb, packet_info *pinfo, } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, "Encrypted Alert"); + col_append_str(pinfo->cinfo, COL_INFO, "Encrypted Alert"); } if (tree) @@ -992,8 +986,7 @@ dissect_dtls_handshake(tvbuff_t *tvb, packet_info *pinfo, /* on second and later iterations, add comma to info col */ if (!first_iteration) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, ", "); } /* |