ifconfig: fix warnings #2

Fix all -Wparameter-unused and cast alignment Differential Revision: https://reviews.freebsd.org/D40303 MFC after: 2 weeks
bsdimp · Jun 1, 2023 · 0c2beef · 0c2beef
1 parent a77facd
commit 0c2beef
Show file tree

Hide file tree

Showing 17 changed files with 125 additions and 118 deletions.
diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c
@@ -263,7 +263,7 @@ static struct in_px *sintab_nl[] = {
 };
 
 static void
-in_copyaddr(if_ctx *ctx, int to, int from)
+in_copyaddr(if_ctx *ctx __unused, int to, int from)
 {
 	sintab_nl[to]->addr = sintab_nl[from]->addr;
 	sintab_nl[to]->addrset = sintab_nl[from]->addrset;

diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c
@@ -99,7 +99,7 @@ extern void nd6_status(if_ctx *);
 static	char addr_buf[NI_MAXHOST];	/*for getnameinfo()*/
 
 static void
-setifprefixlen(if_ctx *ctx, const char *addr, int dummy __unused)
+setifprefixlen(if_ctx *ctx __netlink_unused, const char *addr, int dummy __unused)
 {
 #ifdef WITHOUT_NETLINK
 	const struct afswtch *afp = ctx->afp;
@@ -385,7 +385,7 @@ show_lifetime(struct ifa_cacheinfo *ci)
 }
 
 static void
-in6_status_nl(if_ctx *ctx __unused, if_link_t *link, if_addr_t *ifa)
+in6_status_nl(if_ctx *ctx __unused, if_link_t *link __unused, if_addr_t *ifa)
 {
 	int plen = ifa->ifa_prefixlen;
 	uint32_t scopeid;
@@ -422,7 +422,7 @@ static struct in6_px *sin6tab_nl[] = {
 };
 
 static void
-in6_copyaddr(if_ctx *ctx, int to, int from)
+in6_copyaddr(if_ctx *ctx __unused, int to, int from)
 {
 	sin6tab_nl[to]->addr = sin6tab_nl[from]->addr;
 	sin6tab_nl[to]->set = sin6tab_nl[from]->set;
@@ -771,7 +771,7 @@ static struct afswtch af_inet6 = {
 };
 
 static void
-in6_Lopt_cb(const char *optarg __unused)
+in6_Lopt_cb(const char *arg __unused)
 {
 	ip6lifetime++;	/* print IPv6 address lifetime */
 }

diff --git a/sbin/ifconfig/carp.c b/sbin/ifconfig/carp.c
@@ -114,7 +114,7 @@ setcarp_vhid(if_ctx *ctx, const char *val, int dummy __unused)
 }
 
 static void
-setcarp_callback(int s, void *arg __unused)
+setcarp_callback(int s __unused, void *arg __unused)
 {
 	struct ifconfig_carp carpr = { };
 
@@ -214,8 +214,7 @@ setcarp_peer6(if_ctx *ctx __unused, const char *val, int dummy __unused)
 	if (getaddrinfo(val, NULL, &hints, &res) != 0)
 		errx(1, "Invalid IPv6 address %s", val);
 
-	memcpy(&carp_addr6, &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr,
-	    sizeof(carp_addr6));
+	memcpy(&carp_addr6, &(satosin6(res->ai_addr))->sin6_addr, sizeof(carp_addr6));
 	freeaddrinfo(res);
 }
 

diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c
@@ -373,7 +373,7 @@ unsetbridge_autoptp(if_ctx *ctx, const char *val, int dummy __unused)
 }
 
 static void
-setbridge_flush(if_ctx *ctx, const char *val, int dummy __unused)
+setbridge_flush(if_ctx *ctx, const char *val __unused, int dummy __unused)
 {
 	struct ifbreq req;
 
@@ -384,7 +384,7 @@ setbridge_flush(if_ctx *ctx, const char *val, int dummy __unused)
 }
 
 static void
-setbridge_flushall(if_ctx *ctx, const char *val, int dummy __unused)
+setbridge_flushall(if_ctx *ctx, const char *val __unused, int dummy __unused)
 {
 	struct ifbreq req;
 
@@ -434,7 +434,7 @@ setbridge_deladdr(if_ctx *ctx, const char *val, int dummy __unused)
 }
 
 static void
-setbridge_addr(if_ctx *ctx, const char *val, int dummy __unused)
+setbridge_addr(if_ctx *ctx, const char *val __unused, int dummy __unused)
 {
 
 	bridge_addresses(ctx->io_s, "");

diff --git a/sbin/ifconfig/ifclone.c b/sbin/ifconfig/ifclone.c
@@ -118,7 +118,7 @@ clone_setdefcallback_filter(clone_match_func *filter, clone_callback_func *p)
  * no parameters.
  */
 static void
-ifclonecreate(int s, void *arg)
+ifclonecreate(int s, void *arg __unused)
 {
 	struct ifreq ifr;
 	struct clone_defcb *dcp;
@@ -182,7 +182,7 @@ static struct cmd clone_cmds[] = {
 };
 
 static void
-clone_Copt_cb(const char *optarg __unused)
+clone_Copt_cb(const char *arg __unused)
 {
 	list_cloners();
 	exit(exit_code);

diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
@@ -1776,7 +1776,7 @@ status(struct ifconfig_args *args, const struct sockaddr_dl *sdl,
 
 	print_ifstatus(s);
 	if (args->verbose > 0)
-		sfp_status(s, &ifr, args->verbose);
+		sfp_status(ctx);
 
 	close(s);
 	return;

diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
@@ -43,6 +43,14 @@
 
 #define	__constructor	__attribute__((constructor))
 
+#ifdef WITHOUT_NETLINK
+#define	__netlink_used		__unused
+#define	__netlink_unused
+#else
+#define	__netlink_used
+#define	__netlink_unused	__unused
+#endif
+
 struct afswtch;
 struct cmd;
 struct ifconfig_context;
@@ -267,7 +275,7 @@ typedef void clone_callback_func(int, struct ifreq *);
 void	clone_setdefcallback_prefix(const char *, clone_callback_func *);
 void	clone_setdefcallback_filter(clone_match_func *, clone_callback_func *);
 
-void	sfp_status(int s, struct ifreq *ifr, int verbose);
+void	sfp_status(if_ctx *ctx);
 
 struct sockaddr_dl;
 bool	match_ether(const struct sockaddr_dl *sdl);

diff --git a/sbin/ifconfig/ifconfig_netlink.c b/sbin/ifconfig/ifconfig_netlink.c
@@ -398,7 +398,7 @@ status_nl(if_ctx *ctx, struct iface *iface)
 
 	print_ifstatus(ctx->io_s);
 	if (args->verbose > 0)
-		sfp_status(ctx->io_s, &ifr, args->verbose);
+		sfp_status(ctx);
 }
 
 static int

diff --git a/sbin/ifconfig/ifgif.c b/sbin/ifconfig/ifgif.c
@@ -70,7 +70,7 @@ gif_status(if_ctx *ctx)
 }
 
 static void
-setgifopts(if_ctx *ctx, const char *val, int d)
+setgifopts(if_ctx *ctx, const char *val __unused, int d)
 {
 	int opts;
 

diff --git a/sbin/ifconfig/ifgre.c b/sbin/ifconfig/ifgre.c
@@ -91,7 +91,7 @@ setifgreport(if_ctx *ctx, const char *val, int dummy __unused)
 }
 
 static void
-setifgreopts(if_ctx *ctx, const char *val, int d)
+setifgreopts(if_ctx *ctx, const char *val __unused, int d)
 {
 	uint32_t opts;