Mercurial > hg > dhcpcd

changeset 2208:1bdea6ae471b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compile errors and warnings with IPv6 disabled.
author Roy Marples <roy@marples.name>
date Sun, 05 Jan 2014 08:36:40 +0000
parents 467a20d19019
children 4154d5c40611
files dhcp-common.c if-options.c
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/dhcp-common.c	Fri Jan 03 21:12:19 2014 +0000
+++ b/dhcp-common.c	Sun Jan 05 08:36:40 2014 +0000
@@ -352,9 +352,15 @@
 	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;
--- a/if-options.c	Fri Jan 03 21:12:19 2014 +0000
+++ b/if-options.c	Sun Jan 05 08:36:40 2014 +0000
@@ -1552,6 +1552,7 @@
 	size_t buflen, ol;
 #endif
 #if !defined(INET) || !defined(INET6)
+	size_t i;
 	struct dhcp_opt *opt;
 #endif
 
@@ -1669,7 +1670,7 @@
 		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);