From 0085a47c0cadf52ae5b2a3b97702298de48f520f Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 28 Nov 2002 03:57:50 +0000 Subject: Arguments to hash routines are gconstpointer's; assign them to const pointers. The first argument to "sscanf()" is a "const char *"; don't cast const pointers to "char *" when passing them to "sscanf()". Assign the result of "tvb_get_ptr()" to const pointers, not non-const pointers. Make the "pdata" argument to various DCE routines a const pointer. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6688 f5534014-38df-0310-8fa8-9805f1628bb7 --- packet-asap.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'packet-asap.c') diff --git a/packet-asap.c b/packet-asap.c index efc5663d5c..dd7fa04cf2 100644 --- a/packet-asap.c +++ b/packet-asap.c @@ -6,7 +6,7 @@ * * Copyright 2002, Michael Tuexen * - * $Id: packet-asap.c,v 1.5 2002/08/28 21:00:07 jmayer Exp $ + * $Id: packet-asap.c,v 1.6 2002/11/28 03:57:49 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -209,13 +209,14 @@ dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, prot static void dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { - guint8 *ip6_address_ptr; + const guint8 *ip6_address_ptr; - ip6_address_ptr = (guint8 *)tvb_get_ptr(parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH); + ip6_address_ptr = tvb_get_ptr(parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH); proto_tree_add_ipv6(parameter_tree, hf_parameter_ipv6_address, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, - (const guint8 *)ip6_address_ptr); + ip6_address_ptr); - proto_item_set_text(parameter_item, "IPV6 address parameter: %s", ip6_to_str((struct e_in6_addr *)ip6_address_ptr)); + proto_item_set_text(parameter_item, "IPV6 address parameter: %s", + ip6_to_str((const struct e_in6_addr *)ip6_address_ptr)); } #define SCTP_PORT_LENGTH 2 @@ -329,12 +330,12 @@ static void dissect_pool_handle_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item) { guint16 length, handle_length; - char *handle_ptr; + const char *handle_ptr; length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); handle_length = length - PARAMETER_HEADER_LENGTH; - handle_ptr = (char *)tvb_get_ptr(parameter_tvb, POOL_HANDLE_OFFSET, handle_length); + handle_ptr = (const char *)tvb_get_ptr(parameter_tvb, POOL_HANDLE_OFFSET, handle_length); proto_tree_add_bytes(parameter_tree, hf_pool_handle, parameter_tvb, POOL_HANDLE_OFFSET, handle_length, handle_ptr); proto_item_set_text(parameter_item, "Pool handle"); } -- cgit v1.2.3