From owner-svn-src-head@freebsd.org Sun Dec 29 17:19:58 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4F2DF1E41D9; Sun, 29 Dec 2019 17:19:58 +0000 (UTC) (envelope-from kaktus@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47m6kk13Xfz3Jth; Sun, 29 Dec 2019 17:19:58 +0000 (UTC) (envelope-from kaktus@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1F6D31CBA7; Sun, 29 Dec 2019 17:19:58 +0000 (UTC) (envelope-from kaktus@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBTHJvXF062687; Sun, 29 Dec 2019 17:19:57 GMT (envelope-from kaktus@FreeBSD.org) Received: (from kaktus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBTHJvCf062686; Sun, 29 Dec 2019 17:19:57 GMT (envelope-from kaktus@FreeBSD.org) Message-Id: <201912291719.xBTHJvCf062686@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kaktus set sender to kaktus@FreeBSD.org using -f From: Pawel Biernacki Date: Sun, 29 Dec 2019 17:19:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356179 - head/lib/libc/gen X-SVN-Group: head X-SVN-Commit-Author: kaktus X-SVN-Commit-Paths: head/lib/libc/gen X-SVN-Commit-Revision: 356179 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Dec 2019 17:19:58 -0000 Author: kaktus Date: Sun Dec 29 17:19:57 2019 New Revision: 356179 URL: https://svnweb.freebsd.org/changeset/base/356179 Log: sysctlbyname(2): Remove temporary compatibility layer Remove temporary compatibility layer introduced in r351729. More that 3 months should be enough for everybody who runs HEAD to upgrade to the new kernel already. Reviewed by: imp, mjg (mentor) Approved by: mjg (mentor) Differential Revision: https://reviews.freebsd.org/D22958 Modified: head/lib/libc/gen/sysctlbyname.c Modified: head/lib/libc/gen/sysctlbyname.c ============================================================================== --- head/lib/libc/gen/sysctlbyname.c Sun Dec 29 17:10:21 2019 (r356178) +++ head/lib/libc/gen/sysctlbyname.c Sun Dec 29 17:19:57 2019 (r356179) @@ -33,10 +33,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "libc_private.h" - -#define SYSCTLBYNAME_OSREL 1300045 - extern int __sysctlbyname(const char *name, size_t namelen, void *oldp, size_t *oldlenp, const void *newp, size_t newlen); @@ -44,16 +40,9 @@ int sysctlbyname(const char *name, void *oldp, size_t *oldlenp, const void *newp, size_t newlen) { - int oid[CTL_MAXNAME]; size_t len; - if (__getosreldate() >= SYSCTLBYNAME_OSREL) { - len = strlen(name); - return (__sysctlbyname(name, len, oldp, oldlenp, newp, - newlen)); - } - len = nitems(oid); - if (sysctlnametomib(name, oid, &len) == -1) - return (-1); - return (sysctl(oid, len, oldp, oldlenp, newp, newlen)); + len = strlen(name); + return (__sysctlbyname(name, len, oldp, oldlenp, newp, + newlen)); }