aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rpcap.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-rpcap.c')
-rw-r--r--epan/dissectors/packet-rpcap.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c
index 8910818f20..3b3a79cc62 100644
--- a/epan/dissectors/packet-rpcap.c
+++ b/epan/dissectors/packet-rpcap.c
@@ -776,15 +776,11 @@ dissect_rpcap_packet (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree,
if (!info_added) {
/* Only indicate when not added before */
- if (check_col (pinfo->cinfo, COL_PROTOCOL)) {
- /* Indicate RPCAP in the protocol column */
- col_prepend_fence_fstr(pinfo->cinfo, COL_PROTOCOL, "R|");
- }
-
- if (check_col (pinfo->cinfo, COL_INFO)) {
- /* Indicate RPCAP in the info column */
- col_prepend_fence_fstr (pinfo->cinfo, COL_INFO, "Remote | ");
- }
+ /* Indicate RPCAP in the protocol column */
+ col_prepend_fence_fstr(pinfo->cinfo, COL_PROTOCOL, "R|");
+
+ /* Indicate RPCAP in the info column */
+ col_prepend_fence_fstr (pinfo->cinfo, COL_INFO, "Remote | ");
info_added = TRUE;
register_frame_end_routine(rpcap_frame_end);
}
@@ -811,8 +807,7 @@ dissect_rpcap (tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree)
guint16 msg_value;
guint32 plen;
- if (check_col (pinfo->cinfo, COL_PROTOCOL))
- col_set_str (pinfo->cinfo, COL_PROTOCOL, PSNAME);
+ col_set_str (pinfo->cinfo, COL_PROTOCOL, PSNAME);
col_clear(pinfo->cinfo, COL_INFO);