aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-atmtcp.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2014-08-05 14:54:55 -0400
committerBill Meier <wmeier@newsguy.com>2014-08-05 19:07:28 +0000
commit72c2a33437404dfdf1e4cac9fdcbab854ba6f68e (patch)
tree343570bc82675c6fcea77bdfa819d415d791bb1b /epan/dissectors/packet-atmtcp.c
parent9dc332454aa50e62e68d854cb03eee615b8999f1 (diff)
Do various minor dissector changes:
- remove unneeded initializers; - replace tabs in files with editor mode line 'expandtabs'; - col_set_str() --> col_add_str() (in one case); - tvb_length() -- > tvb_reported_length() (in one case); - do some whitespace & indentation fixes/changes. Change-Id: Ib8ffbbcdb6e4a74c0df6021a75430ae1ef9ae089 Reviewed-on: https://code.wireshark.org/review/3435 Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-atmtcp.c')
-rw-r--r--epan/dissectors/packet-atmtcp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-atmtcp.c b/epan/dissectors/packet-atmtcp.c
index 407c762a5c..531c48baeb 100644
--- a/epan/dissectors/packet-atmtcp.c
+++ b/epan/dissectors/packet-atmtcp.c
@@ -63,7 +63,7 @@ dissect_atmtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATMTCP");
- col_set_str(pinfo->cinfo, COL_INFO, "ATMTCP");
+ col_add_str(pinfo->cinfo, COL_INFO, "ATMTCP");
if (tree) {
ti = proto_tree_add_item(tree, proto_atmtcp, tvb, 0, -1, ENC_NA);
@@ -90,7 +90,7 @@ dissect_atmtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
length = tvb_get_ntohl(tvb, offset);
if(length == ATMTCP_HDR_MAGIC)
{
- col_append_str(pinfo->cinfo, COL_INFO, " Command");
+ col_append_str(pinfo->cinfo, COL_INFO, " Command");
}
else
{
@@ -101,7 +101,7 @@ dissect_atmtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
/* Data (for the moment...) */
next_tvb = tvb_new_subset_remaining(tvb, offset);
call_dissector(data_handle, next_tvb, pinfo, tree);
- return tvb_length(tvb);
+ return tvb_reported_length(tvb);
}