diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-14 12:44:50 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 12:44:50 +0000 |
| commit | 2dbf6c59a2f5d99d3dc8ea3d2ffa409ef2eb611a (patch) | |
| tree | c021a26288d3d501a3dbb8de190cdc6a8e40ffa1 /asn1/sbc-ap | |
| parent | 875040ec1e304110b2a7f1a6e9ead855d3be2e6f (diff) | |
Remove check_col() from ASN.1 dissectors
svn path=/trunk/; revision=49927
Diffstat (limited to 'asn1/sbc-ap')
| -rw-r--r-- | asn1/sbc-ap/packet-sbc-ap-template.c | 9 | ||||
| -rw-r--r-- | asn1/sbc-ap/sbc-ap.cnf | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/asn1/sbc-ap/packet-sbc-ap-template.c b/asn1/sbc-ap/packet-sbc-ap-template.c index b79cd824c4..03c3a9cbdc 100644 --- a/asn1/sbc-ap/packet-sbc-ap-template.c +++ b/asn1/sbc-ap/packet-sbc-ap-template.c @@ -130,12 +130,11 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p static void dissect_sbc_ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - proto_item *sbc_ap_item = NULL; - proto_tree *sbc_ap_tree = NULL; + proto_item *sbc_ap_item = NULL; + proto_tree *sbc_ap_tree = NULL; - /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME); + /* make entry in the Protocol column on summary display */ + col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME); /* create the sbc_ap protocol tree */ if (tree) { diff --git a/asn1/sbc-ap/sbc-ap.cnf b/asn1/sbc-ap/sbc-ap.cnf index ac364c17e5..f10e8edecf 100644 --- a/asn1/sbc-ap/sbc-ap.cnf +++ b/asn1/sbc-ap/sbc-ap.cnf @@ -61,8 +61,7 @@ ProtocolIE-Field/value ie_field_value #.FN_PARS ProcedureCode VAL_PTR = &ProcedureCode #.FN_FTR ProcedureCode - if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", + col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", val_to_str(ProcedureCode, sbc_ap_ProcedureCode_vals, "unknown message")); #.END |