diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-10-31 16:06:23 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-10-31 16:06:23 +0000 |
| commit | 98256ca547863e45122690858bb7b37ec60fb234 (patch) | |
| tree | 2f342ed9d4339872fe648a4de8156d020de0c3be /epan | |
| parent | 58e2d7a0d6b075b7b8dc6234604ed8bdeefd0833 (diff) | |
Revert SVN #26644: The fix is not needed ....
(The funcions writing to COL_INFO are only
called after checking if the column is present).
svn path=/trunk/; revision=26650
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-rmt-fec.c | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-rmt-lct.c | 28 |
2 files changed, 17 insertions, 21 deletions
diff --git a/epan/dissectors/packet-rmt-fec.c b/epan/dissectors/packet-rmt-fec.c index 3a537f5d6b..0592bd6279 100644 --- a/epan/dissectors/packet-rmt-fec.c +++ b/epan/dissectors/packet-rmt-fec.c @@ -73,13 +73,11 @@ const value_string string_fec_encoding_id[] = void fec_info_column(struct _fec *fec, packet_info *pinfo) { - if (check_col(pinfo->cinfo, COL_INFO)) { - if (fec->sbn_present) - col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "SBN: %u", fec->sbn); + if (fec->sbn_present) + col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "SBN: %u", fec->sbn); - if (fec->esi_present) - col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "ESI: 0x%X", fec->esi); - } + if (fec->esi_present) + col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "ESI: 0x%X", fec->esi); } /* Dissection */ diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c index bdd2da38ac..0ff10454c0 100644 --- a/epan/dissectors/packet-rmt-lct.c +++ b/epan/dissectors/packet-rmt-lct.c @@ -226,24 +226,22 @@ gboolean lct_ext_decode(struct _ext *e, struct _lct_prefs *prefs, tvbuff_t *tvb, void lct_info_column(struct _lct *lct, packet_info *pinfo) { - if (check_col(pinfo->cinfo, COL_INFO)) { - if (lct->tsi_present) - col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "TSI: %" G_GINT64_MODIFIER "u", lct->tsi); + if (lct->tsi_present) + col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "TSI: %" G_GINT64_MODIFIER "u", lct->tsi); - if (lct->toi_present) - { - if (lct->toi_size <= 8) - col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "TOI: %" G_GINT64_MODIFIER "u", lct->toi); - else - col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "TOI: 0x%s", bytes_to_str(lct->toi_extended, lct->toi_size)); - } + if (lct->toi_present) + { + if (lct->toi_size <= 8) + col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "TOI: %" G_GINT64_MODIFIER "u", lct->toi); + else + col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "TOI: 0x%s", bytes_to_str(lct->toi_extended, lct->toi_size)); + } - if (lct->close_session) - col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "Close session"); + if (lct->close_session) + col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "Close session"); - if (lct->close_object) - col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "Close object"); - } + if (lct->close_object) + col_append_sep_str(pinfo->cinfo, COL_INFO, " ", "Close object"); } /* Dissection */ |