From 150b9e85b6715ba1027feae7799c13be1e7e6bfa Mon Sep 17 00:00:00 2001 From: Pawel Biernacki Date: Sun, 29 Dec 2019 17:19:57 +0000 Subject: [PATCH] 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 --- lib/libc/gen/sysctlbyname.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/lib/libc/gen/sysctlbyname.c b/lib/libc/gen/sysctlbyname.c index 8ee76c997eb1..9b4ffc0ca4ae 100644 --- a/lib/libc/gen/sysctlbyname.c +++ b/lib/libc/gen/sysctlbyname.c @@ -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)); }