From nobody Fri Oct 08 06:11:00 2021 X-Original-To: dev-commits-src-branches@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 99F5B12D3CC7; Fri, 8 Oct 2021 06:11:11 +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 4HQd9V63gnz3LXX; Fri, 8 Oct 2021 06:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1BC1221FD5; Fri, 8 Oct 2021 06:11:01 +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 1986B0EI007494; Fri, 8 Oct 2021 06:11:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1986B07M007493; Fri, 8 Oct 2021 06:11:00 GMT (envelope-from git) Date: Fri, 8 Oct 2021 06:11:00 GMT Message-Id: <202110080611.1986B07M007493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 2069dce2411d - stable/12 - libsa: make env_discard() public List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2069dce2411d874852c7566f5adefdb1f95795dc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2069dce2411d874852c7566f5adefdb1f95795dc commit 2069dce2411d874852c7566f5adefdb1f95795dc Author: Toomas Soome AuthorDate: 2020-08-19 15:27:09 +0000 Commit: Kyle Evans CommitDate: 2021-10-08 05:24:26 +0000 libsa: make env_discard() public Allow env_discard() to be used outside environment.c (cherry picked from commit 588f0a1e29a341878ad938bb9c239431cac107ae) --- stand/libsa/environment.c | 4 +--- stand/libsa/stand.h | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/stand/libsa/environment.c b/stand/libsa/environment.c index 167dcdb26bfa..94e4a207908b 100644 --- a/stand/libsa/environment.c +++ b/stand/libsa/environment.c @@ -37,8 +37,6 @@ __FBSDID("$FreeBSD$"); #include -static void env_discard(struct env_var *ev); - struct env_var *environ = NULL; /* @@ -194,7 +192,7 @@ unsetenv(const char *name) return (err); } -static void +void env_discard(struct env_var *ev) { if (ev->ev_prev) diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h index 7f0967fb5079..c80edba48fa1 100644 --- a/stand/libsa/stand.h +++ b/stand/libsa/stand.h @@ -338,6 +338,7 @@ extern struct env_var *env_getenv(const char *name); extern int env_setenv(const char *name, int flags, const void *value, ev_sethook_t sethook, ev_unsethook_t unsethook); +extern void env_discard(struct env_var *); extern char *getenv(const char *name); extern int setenv(const char *name, const char *value, int overwrite);