From nobody Sun Oct 10 17:18:28 2021 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 7C14B17DF8BE; Sun, 10 Oct 2021 17:18:28 +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 4HS7tX39X3z3MPL; Sun, 10 Oct 2021 17:18:28 +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 4C9CD118B8; Sun, 10 Oct 2021 17:18:28 +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 19AHIS54031070; Sun, 10 Oct 2021 17:18:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19AHISiX031069; Sun, 10 Oct 2021 17:18:28 GMT (envelope-from git) Date: Sun, 10 Oct 2021 17:18:28 GMT Message-Id: <202110101718.19AHISiX031069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 880aec7361ea - main - cross-build: Remove redundant lines. 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 880aec7361eab106b62dea28f3dedd457b3abb47 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=880aec7361eab106b62dea28f3dedd457b3abb47 commit 880aec7361eab106b62dea28f3dedd457b3abb47 Author: Warner Losh AuthorDate: 2021-10-10 16:21:49 +0000 Commit: Warner Losh CommitDate: 2021-10-10 17:17:14 +0000 cross-build: Remove redundant lines. There's two identical gid_from_group lines in a row. We only need one. Ditto for uid_from_user(). Sponsored by: Netflix Reviewed by: bapt, jrtc27 Differential Revision: https://reviews.freebsd.org/D32442 --- tools/build/cross-build/include/common/grp.h | 2 -- tools/build/cross-build/include/common/pwd.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/tools/build/cross-build/include/common/grp.h b/tools/build/cross-build/include/common/grp.h index 08a8bc540569..750e1e9a49f6 100644 --- a/tools/build/cross-build/include/common/grp.h +++ b/tools/build/cross-build/include/common/grp.h @@ -47,8 +47,6 @@ int pwcache_groupdb(int (*a_setgroupent)(int), void (*a_endgrent)(void), int gid_from_group(const char *name, gid_t *gid); -int gid_from_group(const char *name, gid_t *gid); - const char *group_from_gid(gid_t gid, int noname); #ifdef __linux__ diff --git a/tools/build/cross-build/include/common/pwd.h b/tools/build/cross-build/include/common/pwd.h index e167fe47701f..14abc7fcadf0 100644 --- a/tools/build/cross-build/include/common/pwd.h +++ b/tools/build/cross-build/include/common/pwd.h @@ -45,8 +45,6 @@ int pwcache_userdb(int (*a_setpassent)(int), void (*a_endpwent)(void), struct passwd *(*a_getpwnam)(const char *), struct passwd *(*a_getpwuid)(uid_t)); -int uid_from_user(const char *name, uid_t *uid); - int uid_from_user(const char *name, uid_t *uid); const char *user_from_uid(uid_t uid, int noname);