diff options
| author | gram <gram@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-03-12 04:48:32 +0000 |
|---|---|---|
| committer | gram <gram@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-03-12 04:48:32 +0000 |
| commit | 929f70ac0b14506508e6de9dc357608b91667120 (patch) | |
| tree | 0b5f52ee7613baacc77f73697eb895592aa6a137 /packet-rx.c | |
| parent | 45942c1c41dfad28ac1aeca038e69c888d9a95c4 (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().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1713 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-rx.c')
| -rw-r--r-- | packet-rx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-rx.c b/packet-rx.c index 98172e339a..1e88f54d89 100644 --- a/packet-rx.c +++ b/packet-rx.c @@ -4,7 +4,7 @@ * Based on routines from tcpdump patches by * Ken Hornstein <kenh@cmf.nrl.navy.mil> * - * $Id: packet-rx.c,v 1.8 2000/02/15 21:03:05 gram Exp $ + * $Id: packet-rx.c,v 1.9 2000/03/12 04:47:49 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -110,8 +110,8 @@ dissect_rx(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) if (tree) { - ti = proto_tree_add_item_format(tree, proto_rx, offset, - sizeof(struct rx_header), NULL, "RX Protocol (%s)", + ti = proto_tree_add_protocol_format(tree, proto_rx, offset, + sizeof(struct rx_header), "RX Protocol (%s)", val_to_str(rxh->type,rx_types,"unknown (%d)")); rx_tree = proto_item_add_subtree(ti, ett_rx); |