diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:59:51 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 07:59:51 +0000 |
| commit | 6110a96f689d51c92c5b00b4dfda3a9cd6916a25 (patch) | |
| tree | ef21c459b918013ddfaded20b267565537e9bf64 /epan/dissectors/packet-jxta.c | |
| parent | 0a5b014cecf14ec1bea5c87b0ffb5c2f7fa366a1 (diff) | |
| download | wireshark-6110a96f689d51c92c5b00b4dfda3a9cd6916a25.tar.gz wireshark-6110a96f689d51c92c5b00b4dfda3a9cd6916a25.tar.bz2 wireshark-6110a96f689d51c92c5b00b4dfda3a9cd6916a25.zip | |
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29345
Diffstat (limited to 'epan/dissectors/packet-jxta.c')
| -rw-r--r-- | epan/dissectors/packet-jxta.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 49710f1ccc..9e377c9969 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -475,9 +475,7 @@ static int dissect_jxta_udp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tr return -needed; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "JXTA"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "JXTA"); if (tree) { guint tree_offset = 0; @@ -821,13 +819,9 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree /* Dissect the Welcome Message */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "JXTA"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "JXTA"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Welcome"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Welcome"); { gchar *welcomeline = tvb_get_ephemeral_string(tvb, offset, first_linelen); @@ -1321,9 +1315,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree ep_strbuf_append_printf(dst_addr, ":%d", pinfo->destport); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "JXTA"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "JXTA"); if (check_col(pinfo->cinfo, COL_INFO)) { if( complete_messages > 1 ) { |