diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:36:13 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:36:13 +0000 |
| commit | 0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1 (patch) | |
| tree | 794b4645cb56dead798fc6435eb6b0f741fe19c0 /epan/dissectors/packet-ieee80211.c | |
| parent | 5d5a5442d678c9a2f6a66522cc00013d3476cda6 (diff) | |
Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 7bfb0caad5..6540c995d2 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -6121,8 +6121,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, whdr= &whdrs[0]; col_set_str (pinfo->cinfo, COL_PROTOCOL, "IEEE 802.11"); - if (check_col (pinfo->cinfo, COL_INFO)) - col_clear (pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); fcf = FETCH_FCF(0); frame_type_subtype = COMPOSE_FRAME_TYPE(fcf); @@ -7553,8 +7552,7 @@ dissect_radio (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree *radio_tree = NULL; col_set_str(pinfo->cinfo, COL_PROTOCOL, "Radio"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); /* Add the radio information to the column information */ if (check_col(pinfo->cinfo, COL_TX_RATE)) { @@ -7766,8 +7764,7 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof(hdr)); col_set_str(pinfo->cinfo, COL_PROTOCOL, "Prism"); - if(check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); if(check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Device: %.16s " @@ -8116,8 +8113,7 @@ dissect_wlancap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 antnoise; col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLAN"); - if(check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); offset = 0; version = tvb_get_ntohl(tvb, offset) - WLANCAP_MAGIC_COOKIE_BASE; |