Fix compile errors and warnings with IPv6 disabled.

diff --git a/dhcp-common.c b/dhcp-common.c
index 7e69a2b6f9c0b9b499fad66dc928ea0978fd8a74..3e807a51e82e9e5aa8d545f10a5ce27729d15935 100644 (file)
--- a/dhcp-common.c
+++ b/dhcp-common.c
@@ -352,9 +352,15 @@ dhcp_optlen(const struct dhcp_opt *opt, size_t dl)
        return (dl < sz ? 0 : sz);
 }
 
+#ifdef INET6
+#define PO_IFNAME
+#else
+#define PO_IFNAME __unused
+#endif
+
 ssize_t
 print_option(char *s, ssize_t len, int type, int dl, const uint8_t *data,
-    const char *ifname)
+    PO_IFNAME const char *ifname)
 {
        const uint8_t *e, *t;
        uint16_t u16;

diff --git a/if-options.c b/if-options.c
index 9dd065e8f9223230716ccbee3595b15404cf4075..770245e5eb820b9b073a4dac0c54b841a2e39505 100644 (file)
--- a/if-options.c
+++ b/if-options.c
@@ -1552,6 +1552,7 @@ read_config(const char *file,
        size_t buflen, ol;
 #endif
 #if !defined(INET) || !defined(INET6)
+       size_t i;
        struct dhcp_opt *opt;
 #endif
 
@@ -1669,7 +1670,7 @@ read_config(const char *file,
                dhcp6_opts_len = ifo->dhcp6_override_len;
 #else
                for (i = 0, opt = ifo->dhcp6_override;
-                   i < ifo->dhcp_override6_len;
+                   i < ifo->dhcp6_override_len;
                    i++, opt++)
                        free_dhcp_opt_embenc(opt);
                free(ifo->dhcp6_override);