From nobody Wed Jun 14 09:16:22 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 4Qh0Cp5TVgz4d3TS; Wed, 14 Jun 2023 09:16:22 +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 4Qh0Cp4YGdz3n57; Wed, 14 Jun 2023 09:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686734182; 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=FdL8ZEPBHmPsKpL6W8Lf25JXUxBK9OFJfP2SmWIkhLM=; b=IXNyXbO/5iIDxLl7RWCUQWequ0+tehhVXk6Nx2ZxB6nl7RxrRUf/SDxh0ftloGcxAyMa+C A0Z0aPzhpdY29iOdupnfICZ5ZTGpovxB+fBxD7Kletx+/9j5QD613KHhAKNu2VQKkR6yBb /H7ALZmCuY6UIaIO4hYjCwtE6Qwm+PRdTci9/Hs7QNNeHZr1Lu/kThELnt0sKLFhxY8ejD 3/DGSE7bEfbipg1Om7RCN2ms9lg3XwoYo5HR53zbWOUMySkZZ6L/akqUMNazsx+t5rN++9 8UNZIeeDIoiqWjzYzQJr7DDBax+TKTq4IJG1KzDIkZZgRVrOIJjI9cP9lYayuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686734182; 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=FdL8ZEPBHmPsKpL6W8Lf25JXUxBK9OFJfP2SmWIkhLM=; b=BW+7MjQIQCvbopgLDI+5OpOSdPaR6MPQqDMFKwq7FN0hGb9aLwWT+DqxGQxm7QCVMeGf1j FKP2pmEkLz3doY45jH3VoQm8R4Ty++cxALj9JCXhjMB2a8UOcMSj2tEW2qRZF7P0AjXNnU 1ux9u5VBoq6YBKGo7SASzQf+dqguJSKPxpQJIdK38GQTemBa9vWmEdiDcN7JvLNqjdoPfZ RVDzohanKVmr9f6QiHp7gdymfuKjkMlaEkjlWbyl+iVAPOWd8l4dBY5ELnXMQdis0lSdEG oXymt0d/Xk39dbNUemIOSLjVCRESA4fpoSrMoidA7oLNireH2a3AMLmXIfG4OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686734182; a=rsa-sha256; cv=none; b=Aouh1qj37oksf1ldIa9s4GcCOzgWQ7D2PBTn2RbziFiT3mNj7rotJl5qh+2jFYV3BqRv/8 CXHgxDFJTD8RD6yI7UgyP7NzitHAxUsc9YPrgRD/qxGqvq6k6FYd43GhNHSQs8vVK0v0ye 5WeAIjQe/IkIW+JZqne9D3rPxQzqpRABpUfIBZEKVnFw30ogd0Ppiudt+Rr/cvs83eUa/x pJMMSkbRKTWNkPMH6ENmBKThmEqEwhvZzA4el2Dh6weH6fK3GxR+8QzTzC/Kn7n8dKL9IB bAJoCLl8jyZqp2uFnXO05rjnr00YKQU7tqgfSDaxt05c8SA/Y7mlMPaQDXs6aA== 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 4Qh0Cp3bzyzyHK; Wed, 14 Jun 2023 09:16:22 +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 35E9GMn5086882; Wed, 14 Jun 2023 09:16:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35E9GMf8086881; Wed, 14 Jun 2023 09:16:22 GMT (envelope-from git) Date: Wed, 14 Jun 2023 09:16:22 GMT Message-Id: <202306140916.35E9GMf8086881@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: a6094f844a82 - main - ifconfig: remove 'newaddr' global 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: a6094f844a829832cabdf3019993adcf6a083383 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=a6094f844a829832cabdf3019993adcf6a083383 commit a6094f844a829832cabdf3019993adcf6a083383 Author: Alexander V. Chernikov AuthorDate: 2023-06-14 07:51:27 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-06-14 09:16:09 +0000 ifconfig: remove 'newaddr' global variable Differential Revision: https://reviews.freebsd.org/D40441 MFC after: 2 weeks --- sbin/ifconfig/af_inet6.c | 4 ---- sbin/ifconfig/ifconfig.c | 2 +- sbin/ifconfig/ifconfig.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index 7a771a885412..f1755bcb7a16 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -433,8 +433,6 @@ in6_getaddr(const char *addr_str, int which) { struct in6_px *px = sin6tab_nl[which]; - newaddr &= 1; - px->set = true; px->plen = 128; if (which == ADDR) { @@ -546,8 +544,6 @@ in6_getaddr(const char *s, int which) struct addrinfo hints, *res; int error = -1; - newaddr &= 1; - sin->sin6_len = sizeof(*sin); if (which != MASK) sin->sin6_family = AF_INET6; diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 4f1d95c43a63..e0aae77a317e 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -101,7 +101,7 @@ static int setaddr; static int setmask; static int doalias; static int clearaddr; -int newaddr = 1; +static int newaddr = 1; int exit_code = 0; diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h index a65969ab4c56..9747c125746c 100644 --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -252,7 +252,6 @@ void opt_register(struct option *); extern ifconfig_handle_t *lifh; extern struct ifreq ifr; extern int allmedia; -extern int newaddr; extern int exit_code; extern char *f_inet, *f_inet6, *f_ether, *f_addr;