diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 20:00:52 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 20:00:52 +0000 |
| commit | 6bde91807842874d396f80faf5653e5403c249dc (patch) | |
| tree | 8dc51d6ec7d1ecb0e5d6f8bed87a43ba01fc10a7 /epan/dissectors/packet-auto_rp.c | |
| parent | 3eb06be97d520daef0bad19bf9c261b01abdc66d (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48426
Diffstat (limited to 'epan/dissectors/packet-auto_rp.c')
| -rw-r--r-- | epan/dissectors/packet-auto_rp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c index b05cbb08f3..3f7261e145 100644 --- a/epan/dissectors/packet-auto_rp.c +++ b/epan/dissectors/packet-auto_rp.c @@ -179,7 +179,7 @@ static int do_auto_rp_map(tvbuff_t *tvb, int offset, proto_tree *auto_rp_tree) /* sizeof map header + n * sizeof encoded group addresses */ ti = proto_tree_add_text(auto_rp_tree, tvb, offset, 6 + group_count * 6, - "RP %s: %u group%s", ip_to_str((void *)&rp_addr), + "RP %s: %u group%s", ip_to_str((guint8 *)&rp_addr), group_count, plurality(group_count, "", "s")); map_tree = proto_item_add_subtree(ti, ett_auto_rp_map); @@ -200,7 +200,7 @@ static int do_auto_rp_map(tvbuff_t *tvb, int offset, proto_tree *auto_rp_tree) mask_len = tvb_get_guint8(tvb, offset + 1); group_addr = tvb_get_ipv4(tvb, offset + 2); gi = proto_tree_add_text(map_tree, tvb, offset, 6, "Group %s/%u (%s)", - ip_to_str((void *)&group_addr), mask_len, + ip_to_str((guint8 *)&group_addr), mask_len, val_to_str_const(sign&AUTO_RP_SIGN_MASK, auto_rp_mask_sign_vals, "")); grp_tree = proto_item_add_subtree(gi, ett_auto_rp_group); |