diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-07-07 10:07:42 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-07-07 10:07:42 +0000 |
| commit | d00c2baf5c74dc2e7c678578601795b3fc53e494 (patch) | |
| tree | 6927997497f8cb74e31109c4687d5c2ad1b0c959 /asn1 | |
| parent | 23b068e3078691eee81422008f81017c552da5d9 (diff) | |
| download | wireshark-d00c2baf5c74dc2e7c678578601795b3fc53e494.tar.gz wireshark-d00c2baf5c74dc2e7c678578601795b3fc53e494.tar.bz2 wireshark-d00c2baf5c74dc2e7c678578601795b3fc53e494.zip | |
Remove some check_col() calls.
svn path=/trunk/; revision=28974
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/cdt/cdt.cnf | 27 | ||||
| -rw-r--r-- | asn1/cdt/packet-cdt-template.c | 6 |
2 files changed, 13 insertions, 20 deletions
diff --git a/asn1/cdt/cdt.cnf b/asn1/cdt/cdt.cnf index 2d29212712..96e5e05496 100644 --- a/asn1/cdt/cdt.cnf +++ b/asn1/cdt/cdt.cnf @@ -25,10 +25,9 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt" val_to_str (value, cdt_AlgorithmID_ShortForm_vals, "unknown")); - if (check_col (actx->pinfo->cinfo, COL_INFO)) - col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%%s ", - val_to_str (value, cdt_AlgorithmID_ShortForm_vals, - "unknown")); + col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%%s ", + val_to_str (value, cdt_AlgorithmID_ShortForm_vals, + "unknown")); #.FN_PARS ContentType-ShortForm VAL_PTR = &content_type @@ -40,10 +39,9 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt" val_to_str (content_type, cdt_ContentType_ShortForm_vals, "unknown")); - if (check_col (actx->pinfo->cinfo, COL_INFO)) - col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%%s ", - val_to_str (content_type, cdt_ContentType_ShortForm_vals, - "unknown")); + col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%%s ", + val_to_str (content_type, cdt_ContentType_ShortForm_vals, + "unknown")); #.FN_PARS CompressedContentInfo/contentType/contentType-OID FN_VARIANT = _str VAL_PTR = &obj_id @@ -61,8 +59,7 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt" proto_item_append_text (cdt_item, ", %%s", name); - if (check_col (actx->pinfo->cinfo, COL_INFO)) - col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%%s ", name); + col_append_fstr (actx->pinfo->cinfo, COL_INFO, "%%s ", name); } #.FN_PARS CompressedContent @@ -79,9 +76,8 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt" "[Error: Unable to get compressed content]"); expert_add_info_format (actx->pinfo, tf, PI_UNDECODED, PI_ERROR, "Unable to get compressed content"); - if (check_col (actx->pinfo->cinfo, COL_INFO)) - col_append_str (actx->pinfo->cinfo, COL_INFO, - "[Error: Unable to get compressed content]"); + col_append_str (actx->pinfo->cinfo, COL_INFO, + "[Error: Unable to get compressed content]"); return offset; } @@ -92,9 +88,8 @@ CompressedData B "1.3.26.0.4406.0.4.2" "cdt" "[Error: Unable to uncompress content]"); expert_add_info_format (actx->pinfo, tf, PI_UNDECODED, PI_ERROR, "Unable to uncompress content"); - if (check_col (actx->pinfo->cinfo, COL_INFO)) - col_append_str (actx->pinfo->cinfo, COL_INFO, - "[Error: Unable to uncompress content]"); + col_append_str (actx->pinfo->cinfo, COL_INFO, + "[Error: Unable to uncompress content]"); return offset; } diff --git a/asn1/cdt/packet-cdt-template.c b/asn1/cdt/packet-cdt-template.c index 09a942dda3..04475d9906 100644 --- a/asn1/cdt/packet-cdt-template.c +++ b/asn1/cdt/packet-cdt-template.c @@ -85,10 +85,8 @@ void dissect_cdt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) tree = proto_item_add_subtree (cdt_item, ett_cdt_CompressedData); } - if (check_col (pinfo->cinfo, COL_PROTOCOL)) - col_set_str (pinfo->cinfo, COL_PROTOCOL, "CDT"); - if (check_col (pinfo->cinfo, COL_INFO)) - col_clear (pinfo->cinfo, COL_INFO); + col_set_str (pinfo->cinfo, COL_PROTOCOL, "CDT"); + col_clear (pinfo->cinfo, COL_INFO); dissect_CompressedData_PDU (tvb, pinfo, tree); } |