diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-01-24 09:20:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-01-24 09:20:54 +0000 |
| commit | eb2d6593dca282de10e8dc13a5e2cde4523b800a (patch) | |
| tree | 72ec8d9d161bf956703a8111d9457fca75745804 /packet-esis.c | |
| parent | 6f334976e03a191e5270813a63f6d454df5cb48b (diff) | |
| download | wireshark-eb2d6593dca282de10e8dc13a5e2cde4523b800a.tar.gz wireshark-eb2d6593dca282de10e8dc13a5e2cde4523b800a.tar.bz2 wireshark-eb2d6593dca282de10e8dc13a5e2cde4523b800a.zip | |
Replace a bunch of "tvb_length()" and "tvb_length_remaining()" calls in
arguments to "proto_tree_add_text()", and to "proto_tree_add_XXX()" calls
that add FT_NONE or FT_PROTO items to the protocol tree, with -1.
Replace some calls to "tvb_length()" or "tvb_length_remaining()" with
calls to "tvb_reported_length()" and "tvb_reported_length_remaining()",
as those give the actual length of the data in the packet, not just the
data that happened to be captured.
svn path=/trunk/; revision=4605
Diffstat (limited to 'packet-esis.c')
| -rw-r--r-- | packet-esis.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-esis.c b/packet-esis.c index 9a5c5a6390..3aa0847c47 100644 --- a/packet-esis.c +++ b/packet-esis.c @@ -2,7 +2,7 @@ * Routines for ISO/OSI End System to Intermediate System * Routing Exchange Protocol ISO 9542. * - * $Id: packet-esis.c,v 1.21 2002/01/24 07:24:56 guy Exp $ + * $Id: packet-esis.c,v 1.22 2002/01/24 09:20:47 guy Exp $ * Ralf Schneider <Ralf.Schneider@t-online.de> * * Ethereal - Network traffic analyzer @@ -149,7 +149,7 @@ esis_dissect_unknown( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, va_list ap; va_start(ap, fmat); - proto_tree_add_text_valist(tree, tvb, 0, tvb_length(tvb), fmat, ap); + proto_tree_add_text_valist(tree, tvb, 0, -1, fmat, ap); va_end(ap); } @@ -170,7 +170,7 @@ esis_dissect_esh_pdu( u_char len, tvbuff_t *tvb, packet_info *pinfo, no_sa = tvb_get_guint8(tvb, offset); len -= 1; - ti = proto_tree_add_text( tree, tvb, offset, tvb_length_remaining(tvb, offset), + ti = proto_tree_add_text( tree, tvb, offset, -1, "Number of Source Addresses (SA, Format: NSAP) : %u", no_sa ); offset++; @@ -299,7 +299,7 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { tvb_memcpy(tvb, (guint8 *)&ehdr, 0, sizeof ehdr); if (tree) { - ti = proto_tree_add_item(tree, proto_esis, tvb, 0, tvb_length(tvb), FALSE); + ti = proto_tree_add_item(tree, proto_esis, tvb, 0, -1, FALSE); esis_tree = proto_item_add_subtree(ti, ett_esis); if (ehdr.esis_version != ESIS_REQUIRED_VERSION){ |