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-eth.c | |
| parent | 3d6cb57256c889b2f1ba51e89886d9bb9ea812fb (diff) | |
| download | wireshark-f6e92a9e939a28327eea49b5931715ba97a62970.tar.gz wireshark-f6e92a9e939a28327eea49b5931715ba97a62970.tar.bz2 wireshark-f6e92a9e939a28327eea49b5931715ba97a62970.zip | |
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-eth.c')
| -rw-r--r-- | packet-eth.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-eth.c b/packet-eth.c index 39acc5c1fd..15230e6619 100644 --- a/packet-eth.c +++ b/packet-eth.c @@ -1,7 +1,7 @@ /* packet-eth.c * Routines for ethernet packet disassembly * - * $Id: packet-eth.c,v 1.29 2000/02/15 21:02:07 gram Exp $ + * $Id: packet-eth.c,v 1.30 2000/03/12 04:47:37 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -191,8 +191,8 @@ dissect_eth(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) } if (tree) { - ti = proto_tree_add_item_format(tree, proto_eth, offset, ETH_HEADER_SIZE, - NULL, "IEEE 802.3 %s", (ethhdr_type == ETHERNET_802_3 ? "Raw " : "")); + ti = proto_tree_add_protocol_format(tree, proto_eth, offset, ETH_HEADER_SIZE, + "IEEE 802.3 %s", (ethhdr_type == ETHERNET_802_3 ? "Raw " : "")); fh_tree = proto_item_add_subtree(ti, ett_ieee8023); @@ -217,8 +217,8 @@ dissect_eth(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) col_add_str(fd, COL_INFO, "Ethernet II"); if (tree) { - ti = proto_tree_add_item_format(tree, proto_eth, offset, ETH_HEADER_SIZE, - NULL, "Ethernet II"); + ti = proto_tree_add_protocol_format(tree, proto_eth, offset, ETH_HEADER_SIZE, + "Ethernet II"); fh_tree = proto_item_add_subtree(ti, ett_ether2); |