diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-03-12 04:48:32 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-03-12 04:48:32 +0000 |
| commit | f6e92a9e939a28327eea49b5931715ba97a62970 (patch) | |
| tree | 0b5f52ee7613baacc77f73697eb895592aa6a137 /packet-ppp.c | |
| parent | 3d6cb57256c889b2f1ba51e89886d9bb9ea812fb (diff) | |
| download | wireshark-f6e92a9e939a28327eea49b5931715ba97a62970.tar.gz | |
Break proto_tree_add_item_format() into multiple functions:
proto_tree_add_protocol_format()
proto_tree_add_uint_format()
proto_tree_add_ipxnet_format()
proto_tree_add_ipv4_format()
proto_tree_add_ipv6_format()
proto_tree_add_bytes_format()
proto_tree_add_string_format()
proto_tree_add_ether_format()
proto_tree_add_time_format()
proto_tree_add_double_format()
proto_tree_add_boolean_format()
If using GCC 2.x, we can check the print-format against the variable args
passed in. Regardless of compiler, we can now check at run-time that the
field type passed into the function corresponds to what that function
expects (FT_UINT, FT_BOOLEAN, etc.)
Note that proto_tree_add_protocol_format() does not require a value field,
since the value of a protocol is always NULL. It's more intuitive w/o the
vestigial argument.
Fixed a proto_tree_add_item_format-related bug in packet-isis-hello.c
Fixed a variable usage bug in packet-v120.c. (ett_* was used instead of hf_*)
Checked in Guy's fix for the function declearation for proto_tree_add_text()
and proto_tree_add_notext().
svn path=/trunk/; revision=1713
Diffstat (limited to 'packet-ppp.c')
| -rw-r--r-- | packet-ppp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-ppp.c b/packet-ppp.c index f8d0971407..bf81184d52 100644 --- a/packet-ppp.c +++ b/packet-ppp.c @@ -1,7 +1,7 @@ /* packet-ppp.c * Routines for ppp packet disassembly * - * $Id: packet-ppp.c,v 1.28 2000/02/15 21:02:51 gram Exp $ + * $Id: packet-ppp.c,v 1.29 2000/03/12 04:47:48 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -1092,10 +1092,10 @@ dissect_mp(const u_char *pd, int offset, frame_data *fd, ti = proto_tree_add_text(mp_tree, offset, 1, "Fragment: 0x%2X (%s)", flags, flag_str); hdr_tree = proto_item_add_subtree(ti, ett_mp_flags); - proto_tree_add_item_format(hdr_tree, hf_mp_frag_first, offset, 1, first, + proto_tree_add_boolean_format(hdr_tree, hf_mp_frag_first, offset, 1, first, "%s", decode_boolean_bitfield(flags, MP_FRAG_FIRST, sizeof(flags) * 8, "first", "not first")); - proto_tree_add_item_format(hdr_tree, hf_mp_frag_last, offset, 1, last, + proto_tree_add_boolean_format(hdr_tree, hf_mp_frag_last, offset, 1, last, "%s", decode_boolean_bitfield(flags, MP_FRAG_LAST, sizeof(flags) * 8, "last", "not last")); proto_tree_add_text(hdr_tree, offset, 1, "%s", |