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

Compilation warning fixes.

Browse Source
This commit is contained in:
Simon Kelley
2017-02-28 16:51:58 +00:00
parent 62f9c0d470
commit 13dee6f49e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/dbus.c
View File

@@ -549,17 +549,16 @@ static DBusMessage *dbus_add_lease(DBusMessage* message)
return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS, return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,
"Invalid IP address '%s'", ipaddr); "Invalid IP address '%s'", ipaddr);
hw_len = parse_hex((char*)hwaddr, dhcp_chaddr, DHCP_CHADDR_MAX, NULL, hw_len = parse_hex((char*)hwaddr, dhcp_chaddr, DHCP_CHADDR_MAX, NULL, &hw_type);
&hw_type);
if (hw_type == 0 && hw_len != 0) if (hw_type == 0 && hw_len != 0)
hw_type = ARPHRD_ETHER; hw_type = ARPHRD_ETHER;
lease_set_hwaddr(lease, dhcp_chaddr, clid, hw_len, hw_type, lease_set_hwaddr(lease, dhcp_chaddr, clid, hw_len, hw_type,
clid_len, now, 0); clid_len, now, 0);
lease_set_expires(lease, expires, now); lease_set_expires(lease, expires, now);
if (hostname_len != 0) if (hostname_len != 0)
lease_set_hostname(lease, hostname, 0, get_domain(lease->addr), NULL); lease_set_hostname(lease, hostname, 0, get_domain(lease->addr), NULL);
lease_update_file(now); lease_update_file(now);
lease_update_dns(0); lease_update_dns(0);

3
src/option.c
View File

@@ -4089,7 +4089,7 @@ static void read_file(char *file, FILE *f, int hard_opt)
{ {
int white, i; int white, i;
volatile int option = (hard_opt == LOPT_REV_SERV) ? 0 : hard_opt; volatile int option = (hard_opt == LOPT_REV_SERV) ? 0 : hard_opt;
char *errmess, *p, *arg = NULL, *start; char *errmess, *p, *arg, *start;
size_t len; size_t len;
/* Memory allocation failure longjmps here if mem_recover == 1 */ /* Memory allocation failure longjmps here if mem_recover == 1 */
@@ -4100,6 +4100,7 @@ static void read_file(char *file, FILE *f, int hard_opt)
mem_recover = 1; mem_recover = 1;
} }
arg = NULL;
lineno++; lineno++;
errmess = NULL; errmess = NULL;