From 124faf721cb858fc6d251fcb6527f8c08979a022 Mon Sep 17 00:00:00 2001 From: Kovarththanan Rajaratnam Date: Wed, 23 Sep 2009 14:52:01 +0000 Subject: Use col_set_str instead of col_add_fstr/col_add_str when adding constant strings to COL_INFO svn path=/trunk/; revision=30089 --- epan/dissectors/packet-ansi_tcap.c | 14 +++++++------- epan/dissectors/packet-dnp.c | 3 +-- epan/dissectors/packet-icmpv6.c | 2 +- epan/dissectors/packet-ipars.c | 4 ++-- epan/dissectors/packet-ipsi-ctl.c | 2 +- epan/dissectors/packet-ldss.c | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) (limited to 'epan/dissectors') diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index 1ce23b9bda..9e1e72e2e8 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -1072,7 +1072,7 @@ dissect_ansi_tcap_T_unidirectional(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, #line 85 "ansi_tcap.cnf" gp_tcapsrt_info->ope=TC_ANSI_ALL; if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_add_str(actx->pinfo->cinfo, COL_INFO, "unidirectional "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "unidirectional "); offset = dissect_ansi_tcap_UniTransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -1103,7 +1103,7 @@ dissect_ansi_tcap_T_queryWithPerm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, #line 90 "ansi_tcap.cnf" gp_tcapsrt_info->ope=TC_ANSI_ALL; if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_add_str(actx->pinfo->cinfo, COL_INFO, "queryWithPerm "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "queryWithPerm "); offset = dissect_ansi_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -1118,7 +1118,7 @@ dissect_ansi_tcap_T_queryWithoutPerm(gboolean implicit_tag _U_, tvbuff_t *tvb _U #line 95 "ansi_tcap.cnf" gp_tcapsrt_info->ope=TC_ANSI_ALL; if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_add_str(actx->pinfo->cinfo, COL_INFO, "queryWithoutPerm "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "queryWithoutPerm "); offset = dissect_ansi_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -1133,7 +1133,7 @@ dissect_ansi_tcap_T_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o #line 100 "ansi_tcap.cnf" gp_tcapsrt_info->ope=TC_ANSI_ALL; if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_add_str(actx->pinfo->cinfo, COL_INFO, "response "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "response "); offset = dissect_ansi_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -1148,7 +1148,7 @@ dissect_ansi_tcap_T_conversationWithPerm(gboolean implicit_tag _U_, tvbuff_t *tv #line 105 "ansi_tcap.cnf" gp_tcapsrt_info->ope=TC_ANSI_ALL; if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_add_str(actx->pinfo->cinfo, COL_INFO, "conversationWithPerm "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "conversationWithPerm "); offset = dissect_ansi_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -1163,7 +1163,7 @@ dissect_ansi_tcap_T_conversationWithoutPerm(gboolean implicit_tag _U_, tvbuff_t #line 110 "ansi_tcap.cnf" gp_tcapsrt_info->ope=TC_ANSI_ALL; if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_add_str(actx->pinfo->cinfo, COL_INFO, "conversationWithoutPerm "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "conversationWithoutPerm "); offset = dissect_ansi_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -1260,7 +1260,7 @@ dissect_ansi_tcap_T_abort(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs #line 115 "ansi_tcap.cnf" gp_tcapsrt_info->ope=TC_ANSI_ABORT; if (check_col(actx->pinfo->cinfo, COL_INFO)) - col_add_str(actx->pinfo->cinfo, COL_INFO, "Abort "); + col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort "); offset = dissect_ansi_tcap_Abort(implicit_tag, tvb, offset, actx, tree, hf_index); diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 21c6143872..ca3fc31ebd 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -2560,8 +2560,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (next_tvb) { /* Reassembled */ /* We have the complete payload */ if (check_col (pinfo->cinfo, COL_INFO)) - col_add_str (pinfo->cinfo, COL_INFO, - "Reassembled Application Layer"); + col_set_str(pinfo->cinfo, COL_INFO, "Reassembled Application Layer"); col_set_fence(pinfo->cinfo, COL_INFO); } else diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 0cd48dc515..5ad03663f6 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1640,7 +1640,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_PROTOCOL); col_set_str(pinfo->cinfo, COL_PROTOCOL, "Teredo"); } - col_add_str(pinfo->cinfo, COL_INFO, "Direct IPv6 Connectivity Test"); + col_set_str(pinfo->cinfo, COL_INFO, "Direct IPv6 Connectivity Test"); } else { if (coltypename && strcmp(coltypename, "Unknown") == 0) { g_snprintf(typebuf, sizeof(typebuf), "Unknown (0x%02x)", diff --git a/epan/dissectors/packet-ipars.c b/epan/dissectors/packet-ipars.c index 3f9ad2907f..26944d78a7 100644 --- a/epan/dissectors/packet-ipars.c +++ b/epan/dissectors/packet-ipars.c @@ -90,7 +90,7 @@ dissect_ipars(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) col_add_fstr(pinfo->cinfo, COL_INFO, "GoAhead NextIA (0x%2.2X)", ta); } else { if (check_col(pinfo->cinfo, COL_INFO)) - col_add_str(pinfo->cinfo, COL_INFO, "GoAhead NextIA"); + col_set_str(pinfo->cinfo, COL_INFO, "GoAhead NextIA"); } } } else { /* if its not a 'go ahead'... it must be some kind of data message */ @@ -125,7 +125,7 @@ dissect_ipars(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) if (ia == 0x03) { proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 0, 1, "GoAhead Next IA"); if (check_col(pinfo->cinfo, COL_INFO)) - col_add_str(pinfo->cinfo, COL_INFO, "GoAhead"); + col_set_str(pinfo->cinfo, COL_INFO, "GoAhead"); return; } else if (ia != S1) { proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, diff --git a/epan/dissectors/packet-ipsi-ctl.c b/epan/dissectors/packet-ipsi-ctl.c index 1ac965550d..89c828a43e 100644 --- a/epan/dissectors/packet-ipsi-ctl.c +++ b/epan/dissectors/packet-ipsi-ctl.c @@ -201,7 +201,7 @@ static void dissect_ipsictl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } }else{ if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_str(pinfo->cinfo, COL_INFO, "Initialization"); + col_set_str(pinfo->cinfo, COL_INFO, "Initialization"); } } diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index 17b2bb53ff..7c95225186 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -491,7 +491,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean already_dissected = TRUE; if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_str(pinfo->cinfo, COL_INFO, "LDSS File Transfer (Requesting file - pull)"); + col_set_str(pinfo->cinfo, COL_INFO, "LDSS File Transfer (Requesting file - pull)"); } if (highest_num_seen == 0 || -- cgit v1.2.3