diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-14 01:56:28 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 01:56:28 +0000 |
| commit | fa5b45834b3199bc3c47b3d328d54e0504d7b942 (patch) | |
| tree | 721daa2acddb00e486c5c62923f7b6841b4c13eb /epan/dissectors/packet-portmap.c | |
| parent | 0f0c111119811cf1c6c9353efdaaef302aca5930 (diff) | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49921
Diffstat (limited to 'epan/dissectors/packet-portmap.c')
| -rw-r--r-- | epan/dissectors/packet-portmap.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c index e9bfbb0d65..a8d6bf7997 100644 --- a/epan/dissectors/packet-portmap.c +++ b/epan/dissectors/packet-portmap.c @@ -95,20 +95,17 @@ dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_uint_format(tree, hf_portmap_prog, tvb, offset, 4, prog, "Program: %s (%u)", prog_name, prog); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " %s(%u)", prog_name, prog); + col_append_fstr(pinfo->cinfo, COL_INFO, " %s(%u)", prog_name, prog); - } proto_item_append_text(tree, " GETPORT Call %s(%u)", prog_name, prog); /* version */ version = tvb_get_ntohl(tvb, offset+4); proto_tree_add_item(tree, hf_portmap_version, tvb, offset+4, 4, ENC_BIG_ENDIAN); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " V:%d", version); + col_append_fstr(pinfo->cinfo, COL_INFO, " V:%d", version); + - } proto_item_append_text(tree, " Version:%d", version); @@ -117,10 +114,8 @@ dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_name = ipprotostr(proto); proto_tree_add_uint_format(tree, hf_portmap_proto, tvb, offset+8, 4, proto, "Proto: %s (%u)", proto_name, proto); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " %s", proto_name); + col_append_fstr(pinfo->cinfo, COL_INFO, " %s", proto_name); - } proto_item_append_text(tree, " %s", proto_name); /* port */ @@ -159,9 +154,7 @@ dissect_getport_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset); proto_item_append_text(tree, " GETPORT Reply Port:%d", portx); if(portx){ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " Port:%d", portx); - } + col_append_fstr(pinfo->cinfo, COL_INFO, " Port:%d", portx); proto_item_append_text(tree, " Port:%d", portx); } else { col_append_str(pinfo->cinfo, COL_INFO, " PROGRAM_NOT_AVAILABLE"); |