SQUASHME opal/if/linux_ipv6: fix some compiler warnings

jsquyres · jsquyres · commit 513b3f6030e4 · 2019-07-08T15:02:03.000-07:00
Signed-off-by: Jeff Squyres &lt;jsquyres@cisco.com&gt;
diff --git a/opal/mca/if/linux_ipv6/if_linux_ipv6.c b/opal/mca/if/linux_ipv6/if_linux_ipv6.c
@@ -79,6 +79,7 @@ opal_if_base_component_t mca_if_linux_ipv6_component = {
     },
 };
 
+#if OPAL_ENABLE_IPV6
 static bool hex2int(char hex, int *dst)
 {
     if ('0' <= hex && hex <= '9') {
@@ -94,7 +95,7 @@ static bool hex2int(char hex, int *dst)
 
 }
 
-static bool hexdecode(const char *src, char *dst, size_t dstsize)
+static bool hexdecode(const char *src, uint8_t *dst, size_t dstsize)
 {
     int hi, lo;
     for (size_t i = 0; i < dstsize; i++) {
@@ -106,6 +107,7 @@ static bool hexdecode(const char *src, char *dst, size_t dstsize)
     }
     return true;
 }
+#endif
 
 static int if_linux_ipv6_open(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ opal_if_base_component_t mca_if_linux_ipv6_component = {`
`79`	`79`	`},`
`80`	`80`	`};`
`81`	`81`
	`82`	`+#if OPAL_ENABLE_IPV6`
`82`	`83`	`static bool hex2int(char hex, int *dst)`
`83`	`84`	`{`
`84`	`85`	`if ('0' <= hex && hex <= '9') {`
`@@ -94,7 +95,7 @@ static bool hex2int(char hex, int *dst)`
`94`	`95`
`95`	`96`	`}`
`96`	`97`
`97`		`-static bool hexdecode(const char src, char dst, size_t dstsize)`
	`98`	`+static bool hexdecode(const char src, uint8_t dst, size_t dstsize)`
`98`	`99`	`{`
`99`	`100`	`int hi, lo;`
`100`	`101`	`for (size_t i = 0; i < dstsize; i++) {`
`@@ -106,6 +107,7 @@ static bool hexdecode(const char src, char dst, size_t dstsize)`
`106`	`107`	`}`
`107`	`108`	`return true;`
`108`	`109`	`}`
	`110`	`+#endif`
`109`	`111`
`110`	`112`	`static int if_linux_ipv6_open(void)`
`111`	`113`	`{`