aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2019-05-26 18:33:01 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2019-05-26 19:04:50 +0000
commitdaead4e5fcc3586bb45a4eb8a2bc31dd3de7b2af (patch)
treec8a5b1fbdcac8aab77388e84992a4ef92e26b6e2
parent72cd130f01bfaad5feb620b767d115d7e70e3074 (diff)
dhcp: fix used-but-marked-unused warnings
dhcp.c:3087:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must be >= 10"); ^ dhcp.c:3119:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must be 4"); ^ dhcp.c:3131:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must be 4"); ^ dhcp.c:3143:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must be 4"); ^ dhcp.c:3155:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must >= 1"); ^ dhcp.c:3176:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must >= 5"); ^ dhcp.c:3201:26: error: 'pinfo' was marked unused but was used expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must be 4"); Change-Id: If4e05284a4489e7cea75fee52733851533dacbc1 Reviewed-on: https://code.wireshark.org/review/33372 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-rw-r--r--epan/dissectors/packet-dhcp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c
index bba09b96b9..8a4a302c30 100644
--- a/epan/dissectors/packet-dhcp.c
+++ b/epan/dissectors/packet-dhcp.c
@@ -3077,7 +3077,7 @@ dissect_dhcpopt_forcerenew_nonce(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
}
static int
-dissect_dhcpopt_rdnss(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
+dissect_dhcpopt_rdnss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
int offset = 0;
const guchar *dns_name;
@@ -3113,7 +3113,7 @@ dissect_dhcpopt_dhcp_captive_portal(tvbuff_t *tvb, packet_info *pinfo _U_, proto
}
static int
-dissect_dhcpopt_bulk_lease_query_start(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
+dissect_dhcpopt_bulk_lease_query_start(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
if (tvb_reported_length(tvb) != 4) {
expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must be 4");
@@ -3137,7 +3137,7 @@ dissect_dhcpopt_bulk_lease_query_end(tvbuff_t *tvb, packet_info *pinfo _U_, prot
}
static int
-dissect_dhcpopt_bulk_lease_base_time(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
+dissect_dhcpopt_bulk_lease_base_time(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
if (tvb_reported_length(tvb) != 4) {
expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must be 4");
@@ -3149,7 +3149,7 @@ dissect_dhcpopt_bulk_lease_base_time(tvbuff_t *tvb, packet_info *pinfo _U_, prot
}
static int
-dissect_dhcpopt_bulk_lease_status_code(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
+dissect_dhcpopt_bulk_lease_status_code(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
if (tvb_reported_length(tvb) < 1) {
expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must >= 1");
@@ -3164,7 +3164,7 @@ dissect_dhcpopt_bulk_lease_status_code(tvbuff_t *tvb, packet_info *pinfo _U_, pr
}
static int
-dissect_dhcpopt_pcp_server(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
+dissect_dhcpopt_pcp_server(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
proto_tree *tree_pcp;
int offset = 0;
@@ -3195,7 +3195,7 @@ dissect_dhcpopt_pcp_server(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
}
static int
-dissect_dhcpopt_portparams(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
+dissect_dhcpopt_portparams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
if (tvb_reported_length(tvb) != 4) {
expert_add_info_format(pinfo, tree, &ei_dhcp_bad_length, "length must be 4");