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-sccp.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-sccp.c')
| -rw-r--r-- | epan/dissectors/packet-sccp.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 182b4237ae..bb534d61db 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -2332,12 +2332,10 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree, tree); if (frag_msg && frag_msg->next) { /* Reassembled */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "(Message reassembled) "); } else if (more) { /* Not last packet of reassembled message */ - 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) "); } pinfo->fragmented = save_fragmented; @@ -2573,11 +2571,9 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree, NULL, tree); if (frag_msg) { /* Reassembled */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO,"(Message reassembled) "); + col_append_str(pinfo->cinfo, COL_INFO,"(Message reassembled) "); } else { /* Not last packet of reassembled message */ - 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) "); } pinfo->fragmented = save_fragmented; @@ -2658,12 +2654,10 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree, NULL, tree); if (frag_msg) { /* Reassembled */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "(Message reassembled) "); } else { /* Not last packet of reassembled message */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "(Message fragment) "); } |