diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-14 02:50:46 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 02:50:46 +0000 |
| commit | dfa2156e301539929a12dda54752c778c3ee7a39 (patch) | |
| tree | 8257c41ad55ad71cd0fe15d0464fb82ba2c0f509 /epan/dissectors/packet-starteam.c | |
| parent | e9a5b16a09484d0b3ba5401ef23402c022b82de6 (diff) | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49923
Diffstat (limited to 'epan/dissectors/packet-starteam.c')
| -rw-r--r-- | epan/dissectors/packet-starteam.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c index 5597c2a461..1be3219c11 100644 --- a/epan/dissectors/packet-starteam.c +++ b/epan/dissectors/packet-starteam.c @@ -490,14 +490,13 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "StarTeam"); - if(check_col(pinfo->cinfo, COL_INFO)){ - /* This is a trick to know whether this is the first PDU in this packet or not */ - if(iPreviousFrameNumber != (gint) pinfo->fd->num){ - col_clear(pinfo->cinfo, COL_INFO); - } else { - col_append_str(pinfo->cinfo, COL_INFO, " | "); - } + /* This is a trick to know whether this is the first PDU in this packet or not */ + if(iPreviousFrameNumber != (gint) pinfo->fd->num){ + col_clear(pinfo->cinfo, COL_INFO); + } else { + col_append_str(pinfo->cinfo, COL_INFO, " | "); } + iPreviousFrameNumber = pinfo->fd->num; if(tvb_length(tvb) >= 16){ guint32 iCommand = 0; @@ -514,10 +513,8 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tvb_length_remaining(tvb, offset) >= 66){ iCommand = tvb_get_letohl(tvb, offset + 62); } - if(check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_ext(iCommand, &starteam_opcode_vals_ext, "Unknown (0x%02x)")); - } } if(tree){ |