From nobody Tue Jun 13 06:27:04 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 4QgJVw5D68z4dLrQ; Tue, 13 Jun 2023 06:27:04 +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 4QgJVw1rTZz3nKX; Tue, 13 Jun 2023 06:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686637624; 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=1o/q8Th4zE3huD1/K+ucNcwO4PvwKchtpZWmGEuIxRc=; b=edbybaN6gt3GpKit9EzRj4y+1Dq5u7XvMhvwj+fxLA/s+2I05kriAFae24keBueoMVuMOs WWMeva954OM4/s4IyanRHHToHSBj4qBAqnY1+io6ymlxbTpWyaktpcXVk1tffQ8guaR2ok 8RiNxxRnIME50HYROM2kx6YFfILjDvca6lYI/KqtyZ4jaRIcGhjxiu1nghJOr1G/K0snG6 RwlT0MUxirpnTXpw40l0YR4CEH8EKiQoKUMpnhlCAgvJbKoBxMTRH23R8l8JJc3dyffRO4 jPIw47q42DoEDdM32SiJLsCCM92ACqvb/G5Hocs24N5cYu6fBkXOgERdANHDwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686637624; 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=1o/q8Th4zE3huD1/K+ucNcwO4PvwKchtpZWmGEuIxRc=; b=OnHpN/AkafMfm8kYswDrpPytY2EK5+Do5puvNtBqpY3S0wx9/TXyQ7txxw0in6LnpfZF62 W2IYINP5hP4ZL30WssgUSeX93DTTBB9BX+x4asvn0h2B5PG3JquZ9JksVt4pU6G4CwfZ98 wTXZXt4JkRWhbnTYRBJL0AfXcMKGP1bs/S/4Vpdj8a5DtZoDwMvhJSOFXL3TUyap2LRATZ n7LmSXKrD2R54e/7xJX3u5yl6HcY5Un1+iQhxpg5eFOlUJKegNbnAomVZeMayeYl5GiJCA LfNoIuBsPBivY4iOJC5HHo3DDMeYhBC63wqEaDpfvZh8fk85UD0e8NlxnnjIwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686637624; a=rsa-sha256; cv=none; b=Wcw6RwxxFRJiS1/IWTVGEM5Y7sy+TBvEoBYkqfkqkX/6Y5U6JytjTP3phY8abBrI2wizlu yFL3NCaN64JdMzsaCohLnyACQ+4fy/Vdb0eUOPFKDUKtxt7qbjfi4Y/zT8tDFikoVBSbg0 bgv0F9DjiDoWjlIUsX50Wu+ifzedBaJrM0Xt1h0AElWDiFEAkZs50eKUKguC+NZdnBR2Sq OZrgOq5NWMNjccNf0TgE5oc40D3wDzEZDeJYBCfmg/BikflSTRX2K+B4vatR8ofG35G/wo 1RMe/2bf//XLVj/tVuRtKlZSPrwoqi0LDg4DgPfioJZ1tP+6w7WspoKzkgjLDg== 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 4QgJVw0yVyz1BJX; Tue, 13 Jun 2023 06:27:04 +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 35D6R4RK031055; Tue, 13 Jun 2023 06:27:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35D6R4bY031054; Tue, 13 Jun 2023 06:27:04 GMT (envelope-from git) Date: Tue, 13 Jun 2023 06:27:04 GMT Message-Id: <202306130627.35D6R4bY031054@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: ea73ff9752f7 - main - ifconfig: remove global_args variable. 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: ea73ff9752f77b3ed0d20f3d958fda8b51b0cf23 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=ea73ff9752f77b3ed0d20f3d958fda8b51b0cf23 commit ea73ff9752f77b3ed0d20f3d958fda8b51b0cf23 Author: Alexander V. Chernikov AuthorDate: 2023-06-13 06:25:10 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-06-13 06:25:16 +0000 ifconfig: remove global_args variable. This variable was temporarily introduced in the beginning of the code cleanup. Use on-stack instance in main() instead. Reviewed By: kp Differential Revision: https://reviews.freebsd.org/D40439 MFC after: 2 weeks --- sbin/ifconfig/ifconfig.c | 5 ++--- sbin/ifconfig/ifconfig.h | 1 - sbin/ifconfig/ifmedia.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 0ccca3666bed..7b01b2d547ba 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -103,8 +103,6 @@ static int doalias; static int clearaddr; int newaddr = 1; -struct ifconfig_args global_args; - int exit_code = 0; static char ifname_to_print[IFNAMSIZ]; /* Helper for printifnamemaybe() */ @@ -615,7 +613,8 @@ main(int ac, char *av[]) #ifdef JAIL int jid; #endif - struct ifconfig_args *args = &global_args; + struct ifconfig_args _args = {}; + struct ifconfig_args *args = &_args; f_inet = f_inet6 = f_ether = f_addr = NULL; diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h index 45d05d1bf077..187743a315c5 100644 --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -254,7 +254,6 @@ extern struct ifreq ifr; extern int allmedia; extern int newaddr; extern int exit_code; -extern struct ifconfig_args global_args; extern char *f_inet, *f_inet6, *f_ether, *f_addr; void setifcap(if_ctx *ctx, const char *, int value); diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c index b3331b97e358..122756207d1b 100644 --- a/sbin/ifconfig/ifmedia.c +++ b/sbin/ifconfig/ifmedia.c @@ -144,7 +144,7 @@ media_status(if_ctx *ctx) putchar('\n'); } - if (global_args.supmedia) { + if (ctx->args->supmedia) { printf("\tsupported media:\n"); for (int i = 0; i < ifmr->ifm_count; ++i) { printf("\t\t");