diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-09-27 12:05:32 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-09-27 12:05:32 +0000 |
| commit | 0f2e6c6cc564536c6b7252bdf10d0a6af740afe6 (patch) | |
| tree | ebe659ee68bac8dfe3b2a17f5f0aef8b491af7cc /epan/dissectors/packet-tcap.c | |
| parent | 00e46951ad2d2a4e4f6f703f4e2150478f7df53d (diff) | |
Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39164
Diffstat (limited to 'epan/dissectors/packet-tcap.c')
| -rw-r--r-- | epan/dissectors/packet-tcap.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index 3806596831..af9094b5ba 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -762,7 +762,7 @@ if (parameter_tvb){ break; } - if ((len)&&(check_col(actx->pinfo->cinfo, COL_INFO))){ + if (len){ col_append_str(actx->pinfo->cinfo, COL_INFO, "otid("); for(i=0;i<len;i++) col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%02x",tvb_get_guint8(parameter_tvb,i)); @@ -797,8 +797,7 @@ gp_tcapsrt_info->ope=TC_BEGIN; * If there's something there that should not be overwritten, whoever * put that info there should call col_set_fence() to protect it. */ -if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_set_str(actx->pinfo->cinfo, COL_INFO, "Begin "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "Begin "); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, Begin_sequence, hf_index, ett_tcap_Begin); @@ -838,7 +837,7 @@ if (parameter_tvb){ break; } - if ((len)&&(check_col(actx->pinfo->cinfo, COL_INFO))){ + if (len){ col_append_str(actx->pinfo->cinfo, COL_INFO, "dtid("); for(i=0;i<len;i++) col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%02x",tvb_get_guint8(parameter_tvb,i)); @@ -860,11 +859,10 @@ static const ber_sequence_t End_sequence[] = { static int dissect_tcap_End(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 206 "../../asn1/tcap/tcap.cnf" +#line 205 "../../asn1/tcap/tcap.cnf" gp_tcapsrt_info->ope=TC_END; -if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_set_str(actx->pinfo->cinfo, COL_INFO, "End "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "End "); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, End_sequence, hf_index, ett_tcap_End); @@ -883,11 +881,10 @@ static const ber_sequence_t Continue_sequence[] = { static int dissect_tcap_Continue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 214 "../../asn1/tcap/tcap.cnf" +#line 212 "../../asn1/tcap/tcap.cnf" gp_tcapsrt_info->ope=TC_CONT; -if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_set_str(actx->pinfo->cinfo, COL_INFO, "Continue "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "Continue "); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, Continue_sequence, hf_index, ett_tcap_Continue); @@ -955,11 +952,10 @@ static const ber_sequence_t Abort_sequence[] = { static int dissect_tcap_Abort(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 222 "../../asn1/tcap/tcap.cnf" +#line 219 "../../asn1/tcap/tcap.cnf" gp_tcapsrt_info->ope=TC_ABORT; -if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort "); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, Abort_sequence, hf_index, ett_tcap_Abort); @@ -1484,7 +1480,7 @@ dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* create display subtree for the protocol */ if(parent_tree){ - item = proto_tree_add_item(parent_tree, proto_tcap, tvb, 0, -1, FALSE); + item = proto_tree_add_item(parent_tree, proto_tcap, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_tcap); tcap_stat_tree=tree; } |