diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-09-26 05:52:58 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-09-26 05:52:58 +0000 |
| commit | fc63c358435bc4bf771a0c15943a1aee890a2787 (patch) | |
| tree | 8a9fc1879cbb0c4b9c4823078293dc5e8959b883 /epan/dissectors/packet-acap.c | |
| parent | 69bfd68ac490f8d831614f4f1643265ef27a9bb4 (diff) | |
| download | wireshark-fc63c358435bc4bf771a0c15943a1aee890a2787.tar.gz | |
Get rid of check_col() and use ENC_BIG_ENDIAN.
svn path=/trunk/; revision=39144
Diffstat (limited to 'epan/dissectors/packet-acap.c')
| -rw-r--r-- | epan/dissectors/packet-acap.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c index 634f32f3ea..44d6ec2038 100644 --- a/epan/dissectors/packet-acap.c +++ b/epan/dissectors/packet-acap.c @@ -65,7 +65,7 @@ dissect_acap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * not longer than what's in the buffer, so the "tvb_get_ptr()" * call won't throw an exception. */ - linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE); + linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, ENC_BIG_ENDIAN); line = tvb_get_ptr(tvb, offset, linelen); if (pinfo->match_uint == pinfo->destport) @@ -73,19 +73,17 @@ dissect_acap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else is_request = FALSE; - if (check_col(pinfo->cinfo, COL_INFO)) { - /* - * Put the first line from the buffer into the summary - * (but leave out the line terminator). - */ - col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s", - is_request ? "Request" : "Response", - format_text(line, linelen)); - } + /* + * Put the first line from the buffer into the summary + * (but leave out the line terminator). + */ + col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s", + is_request ? "Request" : "Response", + format_text(line, linelen)); if (tree) { ti = proto_tree_add_item(tree, proto_acap, tvb, offset, -1, - FALSE); + ENC_BIG_ENDIAN); acap_tree = proto_item_add_subtree(ti, ett_acap); if (is_request) { |