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-rtmpt.c | |
| parent | 0f0c111119811cf1c6c9353efdaaef302aca5930 (diff) | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49921
Diffstat (limited to 'epan/dissectors/packet-rtmpt.c')
| -rw-r--r-- | epan/dissectors/packet-rtmpt.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index e8466a0575..db1a91368a 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -1671,9 +1671,9 @@ dissect_rtmpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtmpt_conv_t col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMP"); - RTMPT_DEBUG("Dissect: frame=%u visited=%d len=%d col=%d tree=%p\n", + RTMPT_DEBUG("Dissect: frame=%u visited=%d len=%d tree=%p\n", pinfo->fd->num, pinfo->fd->flags.visited, - tvb_length_remaining(tvb, offset), check_col(pinfo->cinfo, COL_INFO), tree); + tvb_length_remaining(tvb, offset), tree); /* Clear any previous data in Info column (RTMP packets are protected by a "fence") */ col_clear(pinfo->cinfo, COL_INFO); @@ -1713,25 +1713,22 @@ dissect_rtmpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtmpt_conv_t } } - if ((check_col(pinfo->cinfo, COL_INFO) || tree) && tp->id<=RTMPT_ID_MAX) + if (tree && tp->id<=RTMPT_ID_MAX) { sDesc = rtmpt_get_packet_desc(tvb, iBodyOffset, iBodyRemain, rconv, cdir, tp, &deschasopcode); } - if (check_col(pinfo->cinfo, COL_INFO)) - { - if (tp->id>RTMPT_ID_MAX) { - col_append_sep_fstr(pinfo->cinfo, COL_INFO, "|", "%s", - val_to_str(tp->id, rtmpt_handshake_vals, "Unknown (0x%01x)")); - col_set_fence(pinfo->cinfo, COL_INFO); - } else if (sDesc) { - col_append_sep_fstr(pinfo->cinfo, COL_INFO, "|", "%s", sDesc); - col_set_fence(pinfo->cinfo, COL_INFO); - } else { - col_append_sep_fstr(pinfo->cinfo, COL_INFO, "|", "%s", - val_to_str(tp->cmd, rtmpt_opcode_vals, "Unknown (0x%01x)")); - col_set_fence(pinfo->cinfo, COL_INFO); - } + if (tp->id>RTMPT_ID_MAX) { + col_append_sep_fstr(pinfo->cinfo, COL_INFO, "|", "%s", + val_to_str(tp->id, rtmpt_handshake_vals, "Unknown (0x%01x)")); + col_set_fence(pinfo->cinfo, COL_INFO); + } else if (sDesc) { + col_append_sep_fstr(pinfo->cinfo, COL_INFO, "|", "%s", sDesc); + col_set_fence(pinfo->cinfo, COL_INFO); + } else { + col_append_sep_fstr(pinfo->cinfo, COL_INFO, "|", "%s", + val_to_str(tp->cmd, rtmpt_opcode_vals, "Unknown (0x%01x)")); + col_set_fence(pinfo->cinfo, COL_INFO); } if (tree) |