1 From 13dee6f49e1d035b8069947be84ee8da2af0c420 Mon Sep 17 00:00:00 2001
2 From: Simon Kelley <simon@thekelleys.org.uk>
3 Date: Tue, 28 Feb 2017 16:51:58 +0000
4 Subject: [PATCH] Compilation warning fixes.
7 src/dbus.c | 9 ++++-----
9 2 files changed, 6 insertions(+), 6 deletions(-)
11 diff --git a/src/dbus.c b/src/dbus.c
12 index 7e0d342..2e1a48e 100644
15 @@ -549,17 +549,16 @@ static DBusMessage *dbus_add_lease(DBusMessage* message)
16 return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,
17 "Invalid IP address '%s'", ipaddr);
19 - hw_len = parse_hex((char*)hwaddr, dhcp_chaddr, DHCP_CHADDR_MAX, NULL,
21 + hw_len = parse_hex((char*)hwaddr, dhcp_chaddr, DHCP_CHADDR_MAX, NULL, &hw_type);
22 if (hw_type == 0 && hw_len != 0)
23 hw_type = ARPHRD_ETHER;
25 - lease_set_hwaddr(lease, dhcp_chaddr, clid, hw_len, hw_type,
27 + lease_set_hwaddr(lease, dhcp_chaddr, clid, hw_len, hw_type,
29 lease_set_expires(lease, expires, now);
30 if (hostname_len != 0)
31 lease_set_hostname(lease, hostname, 0, get_domain(lease->addr), NULL);
34 lease_update_file(now);
37 diff --git a/src/option.c b/src/option.c
38 index 4a5ef5f..e03b1e3 100644
41 @@ -4089,7 +4089,7 @@ static void read_file(char *file, FILE *f, int hard_opt)
44 volatile int option = (hard_opt == LOPT_REV_SERV) ? 0 : hard_opt;
45 - char *errmess, *p, *arg = NULL, *start;
46 + char *errmess, *p, *arg, *start;
49 /* Memory allocation failure longjmps here if mem_recover == 1 */
50 @@ -4100,6 +4100,7 @@ static void read_file(char *file, FILE *f, int hard_opt)