From nobody Wed Jun 14 09:16:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qh0Cq5wl4z4d3Vd; Wed, 14 Jun 2023 09:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qh0Cq5H1Vz3n7j; Wed, 14 Jun 2023 09:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686734183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CM3T8w09tFFy5M1m6FHaFdOwiAzur391yk7EnPn3Frw=; b=AYEX1BU+ans4wouVL2QyCMVkfQLvmqjwwYSG8VZHnQ+9fcLD9Kk9xV3x61+Qwo1GxvypE4 a0CtZr8yL5xdn87mjDYPYpFI42LtFQpb2G9MW/uFBkp30Y1hCbncaeHJbGnVBYJ1yMe0cB rzIsRxVTVpDN/7r9ZcCuttSuBbvaQV7uUHo9Koz8vRA/UNA71hzpXNdQiG0glRPIxIdOt3 awDVpRjYPIFYeveANsrd6qRLM0CE3ET0wmfoAzLCUkYgg03BW3OXo2qOBXBQq4A2vVF8h/ hmjTf7R9JqBZV0GYMWVmohde4ibgD87X4MzjLgsaMeiWDDQ9JkppaIchGKLeDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686734183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CM3T8w09tFFy5M1m6FHaFdOwiAzur391yk7EnPn3Frw=; b=w1xoPRLtasFIZVwg+HgNSYFUgC4wHldHl2MxNvSJIcibrlaYmm4GsB5ejUXL0oQxz+4PtY RNA+FcWI/3YclehZHywk5iTvOV0qAOQPoZQZVWHtPxZQ3mM8F3OwTZ/sSrz41PMWMX75TC ViGKMBAXujyspO38BSbHfSN4i/Jo2zsh4ttVjxwmJtaofbBjCNclznv0vlMBFk0yr+XwZo 3604ItTrE86DQ6meZ84GA+7qfZJuyMMDgIZZg/tt2tLYhD6rcd5Y6WsEf1XcCF/y/xSRAp ROiXrbp8DzcSEqOQfZxrZo1YGcDCx9ZN937TdQ3JLcWbLvcTOsTCk5oDZJfjVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686734183; a=rsa-sha256; cv=none; b=OQhFpUPzd6t4t5chrWCWI+CaWM1i09F0uT81TvUIuOVwPyjdOv/aSCpdo8/jIAa5F9116g kjZ35nO/txaGcAVl84ysB0p+pk+e3h2qKnG8mekYFjbhzWvxI0pCSCKKS/KeUSXtE5BgWj CoRGjWpeCB3ElGScs0MpGupgaLaemy4CWzzzXI2CAnK/NIvE213G/HjEZt8VecARgmkQNC 60tk2AjSOR5AK5ekX7h21tkN/3ZtEvRIiU9oH+nPisTYsVJ4sP3MbqkQfBaWhh9W9ADV+a AMAtjzZsO/RjRoshquPwd77g9t8S72SOG8I+fnogENkKBOTFYAq+jJZYiQQKTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qh0Cq4JV9zy69; Wed, 14 Jun 2023 09:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35E9GNED086901; Wed, 14 Jun 2023 09:16:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35E9GN1I086900; Wed, 14 Jun 2023 09:16:23 GMT (envelope-from git) Date: Wed, 14 Jun 2023 09:16:23 GMT Message-Id: <202306140916.35E9GN1I086900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 3927d0fb373c - main - ifconfig: fix -Wunused warnings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3927d0fb373c04e99403c9a773312f650607441c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=3927d0fb373c04e99403c9a773312f650607441c commit 3927d0fb373c04e99403c9a773312f650607441c Author: Alexander V. Chernikov AuthorDate: 2023-06-14 07:59:01 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-06-14 09:16:09 +0000 ifconfig: fix -Wunused warnings MFC after: 2 weeks --- sbin/ifconfig/af_inet.c | 2 +- sbin/ifconfig/af_inet6.c | 2 +- sbin/ifconfig/ifclone.c | 2 +- sbin/ifconfig/ifconfig.c | 16 ++++++++-------- sbin/ifconfig/ifconfig.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index 842fdad2a20f..0c6ae253cbd4 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -144,7 +144,7 @@ in_status(if_ctx *ctx __unused, const struct ifaddrs *ifa) printf(" broadcast %s", inet_ntoa(sin->sin_addr)); } - print_vhid(ifa, " "); + print_vhid(ifa); putchar('\n'); } diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index f1755bcb7a16..b8a5cb3012ed 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -356,7 +356,7 @@ in6_status(if_ctx *ctx __unused, const struct ifaddrs *ifa) print_lifetime("vltime", lifetime.ia6t_expire, &now); } - print_vhid(ifa, " "); + print_vhid(ifa); putchar('\n'); } diff --git a/sbin/ifconfig/ifclone.c b/sbin/ifconfig/ifclone.c index ecd8bbc2e556..f0ae93ec792c 100644 --- a/sbin/ifconfig/ifclone.c +++ b/sbin/ifconfig/ifclone.c @@ -151,7 +151,7 @@ ifclonecreate(if_ctx *ctx, void *arg __unused) } static void -clone_create(if_ctx *ctx, const char *cmd __unused, int d __unused) +clone_create(if_ctx *ctx __unused, const char *cmd __unused, int d __unused) { callback_register(ifclonecreate, NULL); } diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index e0aae77a317e..d30d3e1909ae 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1230,7 +1230,7 @@ top: } static void -setifaddr(if_ctx *ctx, const char *addr, int param) +setifaddr(if_ctx *ctx, const char *addr, int param __unused) { const struct afswtch *afp = ctx->afp; @@ -1279,10 +1279,10 @@ settunnel(if_ctx *ctx, const char *src, const char *dst) } static void -deletetunnel(if_ctx *ctx, const char *vname, int param) +deletetunnel(if_ctx *ctx, const char *vname __unused, int param __unused) { - if (ioctl(ctx->io_s, SIOCDIFPHYADDR, &ifr) < 0) + if (ioctl_ctx(ctx, SIOCDIFPHYADDR, &ifr) < 0) err(1, "SIOCDIFPHYADDR"); } @@ -1335,7 +1335,7 @@ setifbroadaddr(if_ctx *ctx, const char *addr, int dummy __unused) } static void -notealias(if_ctx *ctx, const char *addr, int param) +notealias(if_ctx *ctx, const char *addr __unused, int param) { const struct afswtch *afp = ctx->afp; @@ -1515,11 +1515,11 @@ setifpcp(if_ctx *ctx, const char *val, int arg __unused) } static void -disableifpcp(if_ctx *ctx, const char *val, int arg __unused) +disableifpcp(if_ctx *ctx, const char *val __unused, int arg __unused) { ifr.ifr_lan_pcp = IFNET_PCP_NONE; - if (ioctl(ctx->io_s, SIOCSLANPCP, (caddr_t)&ifr) == -1) + if (ioctl_ctx(ctx, SIOCSLANPCP, (caddr_t)&ifr) == -1) err(1, "SIOCSLANPCP"); } @@ -1569,7 +1569,7 @@ setifdescr(if_ctx *ctx, const char *val, int dummy __unused) } static void -unsetifdescr(if_ctx *ctx, const char *val, int value) +unsetifdescr(if_ctx *ctx, const char *val __unused, int value __unused) { setifdescr(ctx, "", 0); } @@ -1858,7 +1858,7 @@ printb(const char *s, unsigned v, const char *bits) } void -print_vhid(const struct ifaddrs *ifa, const char *s) +print_vhid(const struct ifaddrs *ifa) { struct if_data *ifd; diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h index 9747c125746c..7001725543d8 100644 --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -294,7 +294,7 @@ uint32_t if_nametoindex_nl(struct snl_state *ss, const char *ifname); */ struct ifmediareq *ifmedia_getstate(if_ctx *ctx); -void print_vhid(const struct ifaddrs *, const char *); +void print_vhid(const struct ifaddrs *); void ifcreate_ioctl(if_ctx *ctx, struct ifreq *ifr);