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-isl.c | |
| parent | 3d6cb57256c889b2f1ba51e89886d9bb9ea812fb (diff) | |
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-isl.c')
| -rw-r--r-- | packet-isl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-isl.c b/packet-isl.c index 9a7ec6f40c..ff0a626ba4 100644 --- a/packet-isl.c +++ b/packet-isl.c @@ -1,7 +1,7 @@ /* packet-isl.c * Routines for Cisco ISL Ethernet header disassembly * - * $Id: packet-isl.c,v 1.5 2000/02/15 21:02:27 gram Exp $ + * $Id: packet-isl.c,v 1.6 2000/03/12 04:47:41 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -157,8 +157,8 @@ dissect_isl(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) type = (pd[offset+5] >> 4)&0x0F; if (tree) { - ti = proto_tree_add_item_format(tree, proto_isl, offset, ISL_HEADER_SIZE, - NULL, "ISL"); + ti = proto_tree_add_protocol_format(tree, proto_isl, offset, ISL_HEADER_SIZE, + "ISL"); fh_tree = proto_item_add_subtree(ti, ett_isl); proto_tree_add_item(fh_tree, hf_isl_dst, offset+0, 6, &pd[offset+0]); proto_tree_add_item(fh_tree, hf_isl_type, offset+5, 1, pd[offset+5]); |