diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 06:26:46 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 06:26:46 +0000 |
| commit | d9503878072210dc1b03da41b9c5ecaea8cb22f7 (patch) | |
| tree | 13a89a4bf6146b1bbe2afde85c3544eee651ca78 /epan/dissectors/packet-ipx.c | |
| parent | 761b3cce77c05a4c2073749490bd0d1aed1d6e5f (diff) | |
Don't guard col_set_str (COL_PROTOCOL) with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29340 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ipx.c')
| -rw-r--r-- | epan/dissectors/packet-ipx.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index edf18aa8ff..265190b499 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -259,8 +259,7 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ipxh=&ipxh_arr[ipx_current]; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -596,8 +595,7 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) spx_rexmit_info *spx_rexmit_info; spx_info spx_info; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SPX"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SPX"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "SPX"); @@ -847,8 +845,7 @@ dissect_ipxmsg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; guint8 conn_number, sig_char; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX MSG"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX MSG"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -886,8 +883,7 @@ dissect_ipxrip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static const char *rip_type[3] = { "Request", "Response", "Unknown" }; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX RIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX RIP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -956,8 +952,7 @@ dissect_serialization(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ser_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NW_SERIAL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NW_SERIAL"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1229,8 +1224,7 @@ dissect_ipxsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static const char *sap_type[4] = { "General Query", "General Response", "Nearest Query", "Nearest Response" }; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX SAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX SAP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); |