svn commit: r356179 - head/lib/libc/gen

[Pawel Biernacki]

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 <sys/sysctl.h>
 #include <string.h>
 
-#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));
 }