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-smb-common.c | |
parent | 6f334976e03a191e5270813a63f6d454df5cb48b (diff) |
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-smb-common.c')
-rw-r--r-- | packet-smb-common.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/packet-smb-common.c b/packet-smb-common.c index 9955ba1f0c..c15c6f7df8 100644 --- a/packet-smb-common.c +++ b/packet-smb-common.c @@ -2,7 +2,7 @@ * Common routines for smb packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-smb-common.c,v 1.7 2001/07/08 20:38:26 guy Exp $ + * $Id: packet-smb-common.c,v 1.8 2002/01/24 09:20:51 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -88,11 +88,8 @@ dissect_smb_unknown(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off { /* display data as unknown */ - guint len; + proto_tree_add_text(tree, tvb, offset, -1, "Data (%u bytes)", + tvb_reported_length_remaining(tvb, offset)); - len = tvb_length_remaining(tvb, offset); - - proto_tree_add_text(tree, tvb, offset, len, "Data (%u bytes)", len); - - return offset+len; + return offset+tvb_length_remaining(tvb, offset); } |