Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warnings.

Browse Source
This commit is contained in:
Simon Kelley
2025-05-18 18:22:48 +01:00
parent e48a2af4f5
commit baf3c57af5
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/forward.c
View File

@@ -670,6 +670,7 @@ int fast_retry(time_t now)
return ret; return ret;
} }
#if defined(HAVE_IPSET) || defined(HAVE_NFTSET)
static struct ipsets *domain_find_sets(struct ipsets *setlist, const char *domain) { static struct ipsets *domain_find_sets(struct ipsets *setlist, const char *domain) {
/* Similar algorithm to search_servers. */ /* Similar algorithm to search_servers. */
struct ipsets *ipset_pos, *ret = NULL; struct ipsets *ipset_pos, *ret = NULL;
@@ -690,6 +691,7 @@ static struct ipsets *domain_find_sets(struct ipsets *setlist, const char *domai
return ret; return ret;
} }
#endif
static size_t process_reply(struct dns_header *header, time_t now, struct server *server, size_t n, int check_rebind, static size_t process_reply(struct dns_header *header, time_t now, struct server *server, size_t n, int check_rebind,
int no_cache, int cache_secure, int bogusanswer, int ad_reqd, int do_bit, int added_pheader, int no_cache, int cache_secure, int bogusanswer, int ad_reqd, int do_bit, int added_pheader,

6
src/tftp.c
View File

@@ -362,10 +362,10 @@ void tftp_request(struct listener *listen, time_t now)
p = packet + 2; p = packet + 2;
end = packet + len; end = packet + len;
if (ntohs(*((unsigned short *)packet)) != OP_RRQ || if (!(filename = next(&p, end)) ||
!(filename = next(&p, end)) ||
!(mode = next(&p, end)) || !(mode = next(&p, end)) ||
(strcasecmp(mode, "octet") != 0 && strcasecmp(mode, "netascii") != 0)) (strcasecmp(mode, "octet") != 0 && strcasecmp(mode, "netascii") != 0) ||
ntohs(*((unsigned short *)packet)) != OP_RRQ)
{ {
if (!filename) if (!filename)
len = tftp_err(ERR_ILL, packet, _("empty filename in request from %s"), daemon->addrbuff, NULL); len = tftp_err(ERR_ILL, packet, _("empty filename in request from %s"), daemon->addrbuff, NULL);