From 67ee5049d4eaba0c87fe943e5fe8b203cacd378d Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Mon, 10 Oct 2011 00:39:31 +0000 Subject: Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_BOOLEAN FT_IPv4 FT_EUI64 FT_GUID FT_UINT_STRING Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260) svn path=/trunk/; revision=39328 --- epan/dissectors/packet-sflow.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-sflow.c') diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 22e65037aa..e324a10a20 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -1141,10 +1141,10 @@ dissect_sflow_5_ipv4(tvbuff_t *tvb, proto_tree *tree, gint offset) { } offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ipv4_src, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ipv4_src, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ipv4_dst, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ipv4_dst, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; src_port = tvb_get_ntohl(tvb, offset); @@ -1231,10 +1231,10 @@ dissect_sflow_5_ipv6(tvbuff_t *tvb, proto_tree *tree, gint offset) { } offset += 4; - proto_tree_add_item(tree, hf_sflow_245_ipv6_src, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ipv6_src, tvb, offset, 16, ENC_NA); offset += 16; - proto_tree_add_item(tree, hf_sflow_245_ipv6_dst, tvb, offset, 16, FALSE); + proto_tree_add_item(tree, hf_sflow_245_ipv6_dst, tvb, offset, 16, ENC_NA); offset += 16; src_port = tvb_get_ntohl(tvb, offset); -- cgit v1.2.3