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 /asn1 | |
| 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 'asn1')
| -rw-r--r-- | asn1/dap/dap.cnf | 3 | ||||
| -rw-r--r-- | asn1/ldap/ldap.cnf | 3 | ||||
| -rw-r--r-- | asn1/rrlp/rrlp.cnf | 3 | ||||
| -rw-r--r-- | asn1/t38/t38.cnf | 3 | ||||
| -rw-r--r-- | asn1/x420/x420.cnf | 6 |
5 files changed, 6 insertions, 12 deletions
diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf index bdeba52e38..da674ac9a0 100644 --- a/asn1/dap/dap.cnf +++ b/asn1/dap/dap.cnf @@ -256,8 +256,7 @@ OPERATION.&ResultType /* its an empty set - i.e anonymous (assuming version is DEFAULTed) */ proto_tree_add_text(tree, tvb, offset, -1,"Anonymous"); - if(check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_str(actx->pinfo->cinfo, COL_INFO, " anonymous"); + col_append_str(actx->pinfo->cinfo, COL_INFO, " anonymous"); } /* do the default thing */ diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index bbabb40398..5e736b79de 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -153,8 +153,7 @@ PasswordPolicyResponseValue B "1.3.6.1.4.1.42.2.27.8.5.1" "passwordPolicy" if(ldap_info->start_tls_pending && !ldap_info->start_tls_frame) { /* XXX: some directories do not correctly return the responseName in the extendedResponse so we don't know start_tls has been negotiated */ - if(check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[LDAP_START_TLS_OID responseName missing] "); + col_append_str(actx->pinfo->cinfo, COL_INFO, "[LDAP_START_TLS_OID responseName missing] "); ldap_info->start_tls_frame = (actx->pinfo->fd->num) + 1; } diff --git a/asn1/rrlp/rrlp.cnf b/asn1/rrlp/rrlp.cnf index b575f981cf..297dd7e444 100644 --- a/asn1/rrlp/rrlp.cnf +++ b/asn1/rrlp/rrlp.cnf @@ -26,8 +26,7 @@ SLR-Arg-PCS-Extensions proto_tree_add_item(tree, proto_rrlp, tvb, 0, -1, FALSE); - if (check_col(actx->pinfo->cinfo, COL_PROTOCOL)) - col_append_str(actx->pinfo->cinfo, COL_PROTOCOL, "/RRLP"); + col_append_str(actx->pinfo->cinfo, COL_PROTOCOL, "/RRLP"); #.END diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf index 273e8b5c8c..ef54961705 100644 --- a/asn1/t38/t38.cnf +++ b/asn1/t38/t38.cnf @@ -98,8 +98,7 @@ VAL_PTR=&Data_Field_field_type_value data_fragment_table /* list of message fragments */ ); } else { - if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_str(actx->pinfo->cinfo, COL_INFO, " (t4-data Reassembled: No packet lost)"); + col_append_str(actx->pinfo->cinfo, COL_INFO, " (t4-data Reassembled: No packet lost)"); g_snprintf(t38_info->desc_comment, MAX_T38_DESC, "No packet lost"); } diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf index 906df5d099..75e1911099 100644 --- a/asn1/x420/x420.cnf +++ b/asn1/x420/x420.cnf @@ -218,16 +218,14 @@ IpnSecurityResponse B "2.6.1.18.1" "id-sec-security-common-fields" #.FN_BODY IPM - if(check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_str(actx->pinfo->cinfo, COL_INFO, " Message"); + col_append_str(actx->pinfo->cinfo, COL_INFO, " Message"); %(DEFAULT_BODY)s #.FN_BODY IPN - if(check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_str(actx->pinfo->cinfo, COL_INFO, " Notification"); + col_append_str(actx->pinfo->cinfo, COL_INFO, " Notification"); %(DEFAULT_BODY)s |