diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 07:14:16 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 07:14:16 +0000 |
| commit | d629eac134867d997a496115fd1a04090f149fe7 (patch) | |
| tree | d861e71944ccc30f487095c48f50ec6ac915396a /epan/dissectors/packet-gsm_um.c | |
| parent | 12ad4f1ac919095cc620eb4bdaa341823a687de8 (diff) | |
Don't guard col_set_str (COL_RES_DL_SRC/COL_RES_DL_DST) with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29343 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-gsm_um.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_um.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/epan/dissectors/packet-gsm_um.c b/epan/dissectors/packet-gsm_um.c index 0788b1466d..eb995cdad3 100644 --- a/epan/dissectors/packet-gsm_um.c +++ b/epan/dissectors/packet-gsm_um.c @@ -120,10 +120,8 @@ dissect_gsm_um(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM Um"); if (pinfo->pseudo_header->gsm_um.uplink) { - if (check_col(pinfo->cinfo, COL_RES_DL_DST)) - col_set_str(pinfo->cinfo, COL_RES_DL_DST, "BTS"); - if (check_col(pinfo->cinfo, COL_RES_DL_SRC)) - col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "MS"); + col_set_str(pinfo->cinfo, COL_RES_DL_DST, "BTS"); + col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "MS"); } else { switch (pinfo->pseudo_header->gsm_um.channel) { @@ -131,16 +129,13 @@ dissect_gsm_um(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case GSM_UM_CHANNEL_CCCH: case GSM_UM_CHANNEL_PCH: case GSM_UM_CHANNEL_AGCH: - if (check_col(pinfo->cinfo, COL_RES_DL_DST)) - col_set_str(pinfo->cinfo, COL_RES_DL_DST, "Broadcast"); + col_set_str(pinfo->cinfo, COL_RES_DL_DST, "Broadcast"); break; default: - if (check_col(pinfo->cinfo, COL_RES_DL_DST)) - col_set_str(pinfo->cinfo, COL_RES_DL_DST, "MS"); + col_set_str(pinfo->cinfo, COL_RES_DL_DST, "MS"); break; } - if (check_col(pinfo->cinfo, COL_RES_DL_SRC)) - col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "BTS"); + col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "BTS"); } if (tree) { |