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 /epan/dissectors/packet-ftam.c | |
| parent | 0d3840e704c28c370fcec20f216b7f9f97e70283 (diff) | |
| download | wireshark-ba8d7bd919a274912588ae363403abc880843697.tar.gz | |
Get rid of check_col();
svn path=/trunk/; revision=31544
Diffstat (limited to 'epan/dissectors/packet-ftam.c')
| -rw-r--r-- | epan/dissectors/packet-ftam.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index bfd8f62e24..d5e68b81ba 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -1320,9 +1320,7 @@ dissect_ftam_FTAM_Regime_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o if( (branch_taken!=-1) && ftam_FTAM_Regime_PDU_vals[branch_taken].strptr ){ - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_FTAM_Regime_PDU_vals[branch_taken].strptr); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_FTAM_Regime_PDU_vals[branch_taken].strptr); } @@ -3140,7 +3138,7 @@ static const ber_choice_t File_PDU_choice[] = { static int dissect_ftam_File_PDU(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 101 "ftam.cnf" +#line 99 "ftam.cnf" gint branch_taken; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -3149,9 +3147,7 @@ dissect_ftam_File_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _ if( (branch_taken!=-1) && ftam_File_PDU_vals[branch_taken].strptr ){ - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_File_PDU_vals[branch_taken].strptr); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_File_PDU_vals[branch_taken].strptr); } @@ -3446,7 +3442,7 @@ static const ber_choice_t Bulk_Data_PDU_choice[] = { static int dissect_ftam_Bulk_Data_PDU(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 112 "ftam.cnf" +#line 108 "ftam.cnf" gint branch_taken; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -3455,9 +3451,7 @@ dissect_ftam_Bulk_Data_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off if( (branch_taken!=-1) && ftam_Bulk_Data_PDU_vals[branch_taken].strptr ){ - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_Bulk_Data_PDU_vals[branch_taken].strptr); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_Bulk_Data_PDU_vals[branch_taken].strptr); } @@ -4710,7 +4704,7 @@ static const ber_choice_t FSM_PDU_choice[] = { static int dissect_ftam_FSM_PDU(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 123 "ftam.cnf" +#line 117 "ftam.cnf" gint branch_taken; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -4719,9 +4713,7 @@ dissect_ftam_FSM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U if( (branch_taken!=-1) && ftam_FSM_PDU_vals[branch_taken].strptr ){ - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_FSM_PDU_vals[branch_taken].strptr); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_FSM_PDU_vals[branch_taken].strptr); } |