diff options
author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
---|---|---|
committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
commit | e971354a546be5efc284c72e49689a2e337bc198 (patch) | |
tree | 13a89a4bf6146b1bbe2afde85c3544eee651ca78 /epan/dissectors/packet-dplay.c | |
parent | fc067ab9104d12f3683c8f112250b8523260b77f (diff) |
Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
Diffstat (limited to 'epan/dissectors/packet-dplay.c')
-rw-r--r-- | epan/dissectors/packet-dplay.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index 4be8409558..342eca720b 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -1024,8 +1024,7 @@ static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(memcmp(play_id, (guint8 *)&dplay_id, 4) != 0) { - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); /* Clear out stuff in the info column */ if(check_col(pinfo->cinfo,COL_INFO)) col_clear(pinfo->cinfo,COL_INFO); @@ -1039,8 +1038,7 @@ static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) second_message_type = tvb_get_letohs(tvb, 72); } - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); /* Clear out stuff in the info column */ if(check_col(pinfo->cinfo,COL_INFO)) { @@ -1143,8 +1141,7 @@ static void dissect_dplay_player_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tr { guint32 mixed, size, token; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); /* Clear out stuff in the info column */ if(check_col(pinfo->cinfo,COL_INFO)) col_clear(pinfo->cinfo,COL_INFO); |