From 56cf526c68fa844e57c71afdb90ee6545bbd0a60 Mon Sep 17 00:00:00 2001 From: Florian Obser Date: Fri, 3 Dec 2021 18:29:04 +0100 Subject: [PATCH 1/2] Fix -Wmissing-prototypes by declaring functions static. --- services/rpz.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/rpz.c b/services/rpz.c index d408f9383..638dbcedf 100644 --- a/services/rpz.c +++ b/services/rpz.c @@ -836,7 +836,7 @@ rpz_report_rrset_error(const char* msg, uint8_t* rr, size_t rr_len) { } /* from localzone.c; difference is we don't have a dname */ -struct local_rrset* +static struct local_rrset* rpz_clientip_new_rrset(struct regional* region, struct clientip_synthesized_rr* raddr, uint16_t rrtype, uint16_t rrclass) { @@ -1930,7 +1930,7 @@ rpz_synthesize_qname_localdata(struct module_env* env, struct rpz* r, return ret; } -struct clientip_synthesized_rr* +static struct clientip_synthesized_rr* rpz_delegation_point_ipbased_trigger_lookup(struct rpz* rpz, struct iter_qstate* is) { struct delegpt_addr* cursor; @@ -1947,7 +1947,7 @@ rpz_delegation_point_ipbased_trigger_lookup(struct rpz* rpz, struct iter_qstate* return NULL; } -struct dns_msg* +static struct dns_msg* rpz_apply_nsip_trigger(struct module_qstate* ms, struct rpz* r, struct clientip_synthesized_rr* raddr, struct auth_zone* az) { @@ -2006,7 +2006,7 @@ done: return ret; } -struct dns_msg* +static struct dns_msg* rpz_apply_nsdname_trigger(struct module_qstate* ms, struct rpz* r, struct local_zone* z, struct matched_delegation_point const* match, struct auth_zone* az) From ef076c0e15fd9869378c182842db165fa8a762d2 Mon Sep 17 00:00:00 2001 From: Florian Obser Date: Fri, 3 Dec 2021 18:30:08 +0100 Subject: [PATCH 2/2] Fix -Wshadow --- services/rpz.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/rpz.c b/services/rpz.c index 638dbcedf..501817610 100644 --- a/services/rpz.c +++ b/services/rpz.c @@ -1384,9 +1384,9 @@ log_rpz_apply(char* trigger, uint8_t* dname, struct addr_tree_node* addrnode, if(dname) { dname_str(dname, dnamestr); } else if(addrnode) { - char a[128]; - addr_to_str(&addrnode->addr, addrnode->addrlen, a, sizeof(a)); - snprintf(dnamestr, sizeof(dnamestr), "%s/%d", a, addrnode->net); + char addrbuf[128]; + addr_to_str(&addrnode->addr, addrnode->addrlen, addrbuf, sizeof(addrbuf)); + snprintf(dnamestr, sizeof(dnamestr), "%s/%d", addrbuf, addrnode->net); } else { dnamestr[0]=0; }