diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-24 20:21:23 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-24 20:21:23 +0000 |
| commit | 75aab3ac2f7a9c709a30583b5810eaffc2800bb6 (patch) | |
| tree | 687e12b760b8702534057b7348f27994c86b617d /epan/dissectors/packet-sctp.c | |
| parent | d670b7da5cdf68d4a14d8f95b429c569c496d2cf (diff) | |
* Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30127 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-sctp.c')
| -rw-r--r-- | epan/dissectors/packet-sctp.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 9bd6f7250a..5b2dbb6478 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -2197,8 +2197,7 @@ add_fragment(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 tsn, * frame, so it must be a duplicate fragment. maybe a retransmission? * Mark it as duplicate and return NULL */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (Duplicate Message Fragment)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Duplicate Message Fragment)"); proto_tree_add_uint(tree, hf_sctp_duplicate, tvb, 0, 0, fragment->frame_num); return NULL; @@ -2370,8 +2369,7 @@ fragment_reassembly(tvbuff_t *tvb, sctp_fragment* fragment, /* this is not the last fragment, * so let the user know the frame where the reassembly is */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); + col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); proto_tree_add_uint(tree, hf_sctp_reassembled_in, tvb, 0, 0, message->reassembled_in->frame_num); return NULL; @@ -2408,8 +2406,7 @@ fragment_reassembly(tvbuff_t *tvb, sctp_fragment* fragment, * just mark as fragment */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); + col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); return NULL; } @@ -2440,8 +2437,7 @@ fragment_reassembly(tvbuff_t *tvb, sctp_fragment* fragment, */ if ((last_frag->tsn + 1)) { /* there are just fragments missing */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); + col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); return NULL; } @@ -2463,8 +2459,7 @@ fragment_reassembly(tvbuff_t *tvb, sctp_fragment* fragment, if (!frag_i || frag_i != end->fragment || frag_i->tsn != (last_frag->tsn + 1)) { /* we need more fragments. just mark as fragment */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); + col_append_str(pinfo->cinfo, COL_INFO, " (Message Fragment) "); return NULL; } |