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-syslog.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-syslog.c')
| -rw-r--r-- | packet-syslog.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/packet-syslog.c b/packet-syslog.c index 391e15a219..33bd44f0d5 100644 --- a/packet-syslog.c +++ b/packet-syslog.c @@ -3,7 +3,7 @@ * * Copyright 2000, Gerald Combs <gerald@ethereal.com> * - * $Id: packet-syslog.c,v 1.14 2002/01/21 07:36:44 guy Exp $ + * $Id: packet-syslog.c,v 1.15 2002/01/24 09:20:52 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -149,8 +149,6 @@ static void dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - msg_len = tvb_length(tvb); - if (tvb_get_guint8(tvb, 0) == '<' && isdigit(tvb_get_guint8(tvb, 1))) { msg_off++; pri = 0; @@ -187,13 +185,13 @@ static void dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree) { if (pri >= 0) { - ti = proto_tree_add_protocol_format(tree, proto_syslog, tvb, 0, - tvb_length(tvb), "Syslog message: %s.%s: %s", + ti = proto_tree_add_protocol_format(tree, proto_syslog, tvb, 0, -1, + "Syslog message: %s.%s: %s", val_to_str(fac, short_fac, "UNKNOWN"), val_to_str(lev, short_lev, "UNKNOWN"), msg_str); } else { - ti = proto_tree_add_protocol_format(tree, proto_syslog, tvb, 0, - tvb_length(tvb), "Syslog message: (unknown): %s", msg_str); + ti = proto_tree_add_protocol_format(tree, proto_syslog, tvb, 0, -1, + "Syslog message: (unknown): %s", msg_str); } syslog_tree = proto_item_add_subtree(ti, ett_syslog); if (pri >= 0) { |