diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-01-13 20:25:10 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-01-13 20:25:10 +0000 |
| commit | c4dd31cd8792c964cc6e0fa9bfc6ed03caa9aeb7 (patch) | |
| tree | 3f74d12b3e1f71d1d0116091ca8cddf53479683a /epan/dissectors/packet-dplay.c | |
| parent | 37cb4333a449ef51fd9eab22b22713e4ba277f9b (diff) | |
| download | wireshark-c4dd31cd8792c964cc6e0fa9bfc6ed03caa9aeb7.tar.gz wireshark-c4dd31cd8792c964cc6e0fa9bfc6ed03caa9aeb7.tar.bz2 wireshark-c4dd31cd8792c964cc6e0fa9bfc6ed03caa9aeb7.zip | |
From Didier Gautheron:
col_clear.diff
Remove calls to col_clear :
- called twice.
- before functions which also clear the column
- by replacing col_clear + col_append_xxx with col_add_xxx
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4394
svn path=/trunk/; revision=31517
Diffstat (limited to 'epan/dissectors/packet-dplay.c')
| -rw-r--r-- | epan/dissectors/packet-dplay.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index 9472a850cd..4436abf461 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -1025,10 +1025,7 @@ static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(memcmp(play_id, (guint8 *)&dplay_id, 4) != 0) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); - /* Clear out stuff in the info column */ - col_clear(pinfo->cinfo, COL_INFO); - if(check_col(pinfo->cinfo,COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "DPlay data packet"); + col_set_str(pinfo->cinfo,COL_INFO, "DPlay data packet"); return; } @@ -1038,8 +1035,6 @@ static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); - /* Clear out stuff in the info column */ - col_clear(pinfo->cinfo, COL_INFO); if(check_col(pinfo->cinfo,COL_INFO)) { @@ -1138,10 +1133,7 @@ static void dissect_dplay_player_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tr guint32 mixed, size, token; col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); - /* Clear out stuff in the info column */ - col_clear(pinfo->cinfo, COL_INFO); - if(check_col(pinfo->cinfo,COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "DPlay player to player message"); + col_set_str(pinfo->cinfo,COL_INFO, "DPlay player to player message"); if(tree) { |