aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-fcels.c4
-rw-r--r--epan/dissectors/packet-ieee802154.c10
-rw-r--r--epan/dissectors/packet-ipv6.c4
-rw-r--r--epan/dissectors/packet-netlink-sock_diag.c4
-rw-r--r--epan/dissectors/packet-vrrp.c4
-rw-r--r--epan/dissectors/packet-xmpp-utils.c4
6 files changed, 14 insertions, 16 deletions
diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c
index 87ad5b0cfa..aea5dbadb0 100644
--- a/epan/dissectors/packet-fcels.c
+++ b/epan/dissectors/packet-fcels.c
@@ -1877,7 +1877,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
return 0;
}
- srcfc = (guint8 *)pinfo->src.data;
+ srcfc = (const guint8 *)pinfo->src.data;
if (srcfc[2]) {
/* If it is a loop port, we'll need to remember the ALPA */
options = NO_PORT2;
@@ -1941,7 +1941,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
return 0;
}
- dstfc = (guint8 *)pinfo->dst.data;
+ dstfc = (const guint8 *)pinfo->dst.data;
addrdata[0] = addrdata[1] = 0;
addrdata[2] = dstfc[2];
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index d7d87631e1..7e39fcf521 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -2172,26 +2172,26 @@ ccm_cbc_mac(const gchar *key _U_, const gchar *iv _U_, const gchar *a _U_, gint
/* Key hash function. */
guint ieee802154_short_addr_hash(gconstpointer key)
{
- return (((ieee802154_short_addr *)key)->addr) | (((ieee802154_short_addr *)key)->pan << 16);
+ return (((const ieee802154_short_addr *)key)->addr) | (((const ieee802154_short_addr *)key)->pan << 16);
}
/* Key equal function. */
gboolean ieee802154_short_addr_equal(gconstpointer a, gconstpointer b)
{
- return (((ieee802154_short_addr *)a)->pan == ((ieee802154_short_addr *)b)->pan) &&
- (((ieee802154_short_addr *)a)->addr == ((ieee802154_short_addr *)b)->addr);
+ return (((const ieee802154_short_addr *)a)->pan == ((const ieee802154_short_addr *)b)->pan) &&
+ (((const ieee802154_short_addr *)a)->addr == ((const ieee802154_short_addr *)b)->addr);
}
/* Key hash function. */
guint ieee802154_long_addr_hash(gconstpointer key)
{
- return (guint)(((ieee802154_long_addr *)key)->addr) & 0xFFFFFFFF;
+ return (guint)(((const ieee802154_long_addr *)key)->addr) & 0xFFFFFFFF;
}
/* Key equal function. */
gboolean ieee802154_long_addr_equal(gconstpointer a, gconstpointer b)
{
- return (((ieee802154_long_addr *)a)->addr == ((ieee802154_long_addr *)b)->addr);
+ return (((const ieee802154_long_addr *)a)->addr == ((const ieee802154_long_addr *)b)->addr);
}
/*FUNCTION:------------------------------------------------------
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index c33e98865e..853149967b 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -735,8 +735,8 @@ dissect_routing6(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo
/* IPv6 source address used for strict checking */
struct e_in6_addr srcAddr;
offset += 4;
- memcpy((guint8 *)&dstAddr, (guint8 *)pinfo->dst.data, pinfo->dst.len);
- memcpy((guint8 *)&srcAddr, (guint8 *)pinfo->src.data, pinfo->src.len);
+ memcpy((guint8 *)&dstAddr, pinfo->dst.data, pinfo->dst.len);
+ memcpy((guint8 *)&srcAddr, pinfo->src.data, pinfo->src.len);
/* from RFC6554: Multicast addresses MUST NOT appear in the IPv6 Destination Address field */
if(g_ipv6_rpl_srh_strict_rfc_checking && in6_is_addr_multicast(&dstAddr)){
diff --git a/epan/dissectors/packet-netlink-sock_diag.c b/epan/dissectors/packet-netlink-sock_diag.c
index 0a54809a6d..683791c194 100644
--- a/epan/dissectors/packet-netlink-sock_diag.c
+++ b/epan/dissectors/packet-netlink-sock_diag.c
@@ -784,12 +784,10 @@ static header_field_info hfi_netlink_sock_diag_netlink_dst_port_id NETLINK_SOCK_
static int
dissect_sock_diag_netlink_reply(tvbuff_t *tvb, netlink_sock_diag_info_t *info, proto_tree *tree, int offset)
{
- proto_item *ti;
-
proto_tree_add_item(tree, &hfi_netlink_sock_diag_family, tvb, offset, 1, ENC_NA);
offset += 1;
- ti = proto_tree_add_item(tree, &hfi_netlink_sock_diag_type, tvb, offset, 1, ENC_NA);
+ /* ti = */ proto_tree_add_item(tree, &hfi_netlink_sock_diag_type, tvb, offset, 1, ENC_NA);
switch (tvb_get_guint8(tvb, offset)) {
case WS_SOCK_DGRAM:
case WS_SOCK_RAW:
diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c
index e54004b8c6..a65f93c3e1 100644
--- a/epan/dissectors/packet-vrrp.c
+++ b/epan/dissectors/packet-vrrp.c
@@ -179,9 +179,9 @@ dissect_vrrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
switch(hi_nibble(ver_type)) {
case 3:
/* Set up the fields of the pseudo-header. */
- cksum_vec[0].ptr = (guint8 *)pinfo->src.data;
+ cksum_vec[0].ptr = (const guint8 *)pinfo->src.data;
cksum_vec[0].len = pinfo->src.len;
- cksum_vec[1].ptr = (guint8 *)pinfo->dst.data;
+ cksum_vec[1].ptr = (const guint8 *)pinfo->dst.data;
cksum_vec[1].len = pinfo->dst.len;
cksum_vec[2].ptr = (const guint8 *)&phdr;
phdr[0] = g_htonl(vrrp_len);
diff --git a/epan/dissectors/packet-xmpp-utils.c b/epan/dissectors/packet-xmpp-utils.c
index 8ca7bab75a..0aa1905740 100644
--- a/epan/dissectors/packet-xmpp-utils.c
+++ b/epan/dissectors/packet-xmpp-utils.c
@@ -385,9 +385,9 @@ xmpp_ep_string_upcase(const gchar* string)
gint
xmpp_element_t_cmp(gconstpointer a, gconstpointer b)
{
- gint result = strcmp(((xmpp_element_t*)a)->name,((xmpp_element_t*)b)->name);
+ gint result = strcmp(((const xmpp_element_t*)a)->name,((const xmpp_element_t*)b)->name);
- if(result == 0 && ((xmpp_element_t*)a)->was_read)
+ if(result == 0 && ((const xmpp_element_t*)a)->was_read)
result = -1;
return result;