diff options
author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 07:59:51 +0000 |
---|---|---|
committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 07:59:51 +0000 |
commit | 7a1740736d1aca5c3f0e07951327d24056237c5c (patch) | |
tree | ef21c459b918013ddfaded20b267565537e9bf64 /asn1 | |
parent | b2e9a22ec53becba2c23777ffee4ff375d135698 (diff) |
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29345 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/ansi-tcap/packet-ansi_tcap-template.c | 5 | ||||
-rw-r--r-- | asn1/ansi_map/packet-ansi_map-template.c | 5 | ||||
-rw-r--r-- | asn1/camel/packet-camel-template.c | 4 | ||||
-rw-r--r-- | asn1/gsmmap/packet-gsmmap-template.c | 5 | ||||
-rw-r--r-- | asn1/inap/packet-inap-template.c | 5 | ||||
-rw-r--r-- | asn1/t125/packet-t125-template.c | 8 | ||||
-rw-r--r-- | asn1/t38/packet-t38-template.c | 8 | ||||
-rw-r--r-- | asn1/tcap/packet-tcap-template.c | 5 |
8 files changed, 10 insertions, 35 deletions
diff --git a/asn1/ansi-tcap/packet-ansi_tcap-template.c b/asn1/ansi-tcap/packet-ansi_tcap-template.c index 6b10749375..0a4a2220b3 100644 --- a/asn1/ansi-tcap/packet-ansi_tcap-template.c +++ b/asn1/ansi-tcap/packet-ansi_tcap-template.c @@ -332,10 +332,7 @@ dissect_ansi_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) ansi_tcap_ctx_init(&ansi_tcap_private); tcap_top_tree = parent_tree; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ANSI TCAP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ANSI TCAP"); /* create display subtree for the protocol */ if(parent_tree){ diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c index 001e51d0b2..aeb6881757 100644 --- a/asn1/ansi_map/packet-ansi_map-template.c +++ b/asn1/ansi_map/packet-ansi_map-template.c @@ -4333,10 +4333,7 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ANSI MAP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ANSI MAP"); /* Data from the TCAP dissector */ if (pinfo->private_data == NULL){ diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c index c9a85f95cc..c49bbfb645 100644 --- a/asn1/camel/packet-camel-template.c +++ b/asn1/camel/packet-camel-template.c @@ -444,9 +444,7 @@ dissect_camel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Camel"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Camel"); /* create display subtree for the protocol */ if(parent_tree){ diff --git a/asn1/gsmmap/packet-gsmmap-template.c b/asn1/gsmmap/packet-gsmmap-template.c index e1d23c27ad..7c205e65a4 100644 --- a/asn1/gsmmap/packet-gsmmap-template.c +++ b/asn1/gsmmap/packet-gsmmap-template.c @@ -1776,10 +1776,7 @@ dissect_gsm_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM MAP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM MAP"); top_tree = parent_tree; diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c index 55aeb4f8fd..a2042a8de7 100644 --- a/asn1/inap/packet-inap-template.c +++ b/asn1/inap/packet-inap-template.c @@ -129,10 +129,7 @@ dissect_inap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "INAP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "INAP"); /* create display subtree for the protocol */ if(parent_tree){ diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c index 1a60cf1a67..36dc6c01d6 100644 --- a/asn1/t125/packet-t125-template.c +++ b/asn1/t125/packet-t125-template.c @@ -61,9 +61,7 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) gboolean pc; gint32 tag; - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.125"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.125"); if (check_col(pinfo->cinfo, COL_INFO)){ col_clear(pinfo->cinfo, COL_INFO); } @@ -76,9 +74,7 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) if ( (class==BER_CLASS_APP) && (tag>=101) && (tag<=104) ){ dissect_ConnectMCSPDU_PDU(tvb, pinfo, tree); } else { - if (check_col(pinfo->cinfo, COL_INFO)){ - col_set_str(pinfo->cinfo, COL_INFO, "T.125 payload"); - } + col_set_str(pinfo->cinfo, COL_INFO, "T.125 payload"); proto_tree_add_text(tree, tvb, 0, -1, "T.125 payload"); } diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index be20461ab2..d3345e41e2 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -512,9 +512,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38"); if (check_col(pinfo->cinfo, COL_INFO)){ col_clear(pinfo->cinfo, COL_INFO); } @@ -561,9 +559,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; guint16 ifp_packet_number=1; - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38"); if (check_col(pinfo->cinfo, COL_INFO)){ col_clear(pinfo->cinfo, COL_INFO); } diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c index 76f3f01812..cd896c48c3 100644 --- a/asn1/tcap/packet-tcap-template.c +++ b/asn1/tcap/packet-tcap-template.c @@ -201,10 +201,7 @@ dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) tcap_top_tree = parent_tree; tcap_stat_tree = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCAP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCAP"); /* create display subtree for the protocol */ if(parent_tree){ |