From f6e92a9e939a28327eea49b5931715ba97a62970 Mon Sep 17 00:00:00 2001 From: Gilbert Ramirez Date: Sun, 12 Mar 2000 04:48:32 +0000 Subject: 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 --- packet-pim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packet-pim.c') diff --git a/packet-pim.c b/packet-pim.c index e481fa7563..bcd5a0b8d0 100644 --- a/packet-pim.c +++ b/packet-pim.c @@ -2,7 +2,7 @@ * Routines for PIM disassembly * (c) Copyright Jun-ichiro itojun Hagino * - * $Id: packet-pim.c,v 1.9 2000/02/15 21:02:49 gram Exp $ + * $Id: packet-pim.c,v 1.10 2000/03/12 04:47:47 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -223,7 +223,7 @@ dissect_pim(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { proto_tree_add_item(pim_tree, hf_pim_version, offset, 1, PIM_VER(pim.pim_typever)); - proto_tree_add_item_format(pim_tree, hf_pim_type, offset, 1, + proto_tree_add_uint_format(pim_tree, hf_pim_type, offset, 1, PIM_TYPE(pim.pim_typever), "Type: %s (%u)", typestr, PIM_TYPE(pim.pim_typever)); -- cgit v1.2.3