diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-01-17 12:19:02 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-01-17 12:19:02 +0000 |
| commit | ba8d7bd919a274912588ae363403abc880843697 (patch) | |
| tree | 2af5611d4171706d47b054521c7bc9f236b2a5df /asn1/dop | |
| parent | 0d3840e704c28c370fcec20f216b7f9f97e70283 (diff) | |
| download | wireshark-ba8d7bd919a274912588ae363403abc880843697.tar.gz wireshark-ba8d7bd919a274912588ae363403abc880843697.tar.bz2 wireshark-ba8d7bd919a274912588ae363403abc880843697.zip | |
Get rid of check_col();
svn path=/trunk/; revision=31544
Diffstat (limited to 'asn1/dop')
| -rw-r--r-- | asn1/dop/dop.cnf | 8 | ||||
| -rw-r--r-- | asn1/dop/packet-dop-template.c | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/asn1/dop/dop.cnf b/asn1/dop/dop.cnf index cd770a302a..b4318750b2 100644 --- a/asn1/dop/dop.cnf +++ b/asn1/dop/dop.cnf @@ -173,9 +173,7 @@ OpBindingErrorParam/bindingType BindingType %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " id=%%d", value); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " id=%%d", value); @@ -184,9 +182,7 @@ OpBindingErrorParam/bindingType BindingType %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, ",%%d", value); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, ",%%d", value); #.FN_PARS Precedence VAL_PTR = &precedence diff --git a/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c index 1990c8acdc..58e1e625dd 100644 --- a/asn1/dop/packet-dop-template.c +++ b/asn1/dop/packet-dop-template.c @@ -81,10 +81,8 @@ static void append_oid(packet_info *pinfo, const char *oid) { const char *name = NULL; - if(check_col(pinfo->cinfo, COL_INFO)) { name = oid_resolved_from_string(oid); col_append_fstr(pinfo->cinfo, COL_INFO, " %s", name ? name : oid); - } } #include "packet-dop-fn.c" @@ -96,8 +94,7 @@ call_dop_oid_callback(char *base_string, tvbuff_t *tvb, int offset, packet_info binding_param = ep_strdup_printf("%s.%s", base_string, binding_type ? binding_type : ""); - if (col_info && (check_col(pinfo->cinfo, COL_INFO))) - col_append_fstr(pinfo->cinfo, COL_INFO, " %s", col_info); + col_append_fstr(pinfo->cinfo, COL_INFO, " %s", col_info); if (dissector_try_string(dop_dissector_table, binding_param, tvb, pinfo, tree)) { offset += tvb_length_remaining (tvb, offset); @@ -222,8 +219,7 @@ dissect_dop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if(dop_dissector) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, dop_op_name); + col_set_str(pinfo->cinfo, COL_INFO, dop_op_name); while (tvb_reported_length_remaining(tvb, offset) > 0){ old_offset=offset; |