aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rsh.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2013-06-14 01:56:28 +0000
committerMichael Mann <mmann78@netscape.net>2013-06-14 01:56:28 +0000
commitfa5b45834b3199bc3c47b3d328d54e0504d7b942 (patch)
tree721daa2acddb00e486c5c62923f7b6841b4c13eb /epan/dissectors/packet-rsh.c
parent0f0c111119811cf1c6c9353efdaaef302aca5930 (diff)
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49921
Diffstat (limited to 'epan/dissectors/packet-rsh.c')
-rw-r--r--epan/dissectors/packet-rsh.c28
1 files changed, 13 insertions, 15 deletions
diff --git a/epan/dissectors/packet-rsh.c b/epan/dissectors/packet-rsh.c
index 18ee0cd34b..8aee371ca3 100644
--- a/epan/dissectors/packet-rsh.c
+++ b/epan/dissectors/packet-rsh.c
@@ -204,24 +204,22 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RSH");
- if(check_col(pinfo->cinfo, COL_INFO)){
- /* First, clear the info column */
- col_clear(pinfo->cinfo, COL_INFO);
+ /* First, clear the info column */
+ col_clear(pinfo->cinfo, COL_INFO);
- /* Client username */
- if(hash_info->client_username && preference_info_show_client_username == TRUE){
- col_append_fstr(pinfo->cinfo, COL_INFO, "Client username:%s ", hash_info->client_username);
- }
+ /* Client username */
+ if(hash_info->client_username && preference_info_show_client_username == TRUE){
+ col_append_fstr(pinfo->cinfo, COL_INFO, "Client username:%s ", hash_info->client_username);
+ }
- /* Server username */
- if(hash_info->server_username && preference_info_show_server_username == TRUE){
- col_append_fstr(pinfo->cinfo, COL_INFO, "Server username:%s ", hash_info->server_username);
- }
+ /* Server username */
+ if(hash_info->server_username && preference_info_show_server_username == TRUE){
+ col_append_fstr(pinfo->cinfo, COL_INFO, "Server username:%s ", hash_info->server_username);
+ }
- /* Command */
- if(hash_info->command && preference_info_show_command == TRUE){
- col_append_fstr(pinfo->cinfo, COL_INFO, "Command:%s ", hash_info->command);
- }
+ /* Command */
+ if(hash_info->command && preference_info_show_command == TRUE){
+ col_append_fstr(pinfo->cinfo, COL_INFO, "Command:%s ", hash_info->command);
}
/* create display subtree for the protocol */