Loading...
stdlib/FreeBSD/getenv.c Libc-825.26 Libc-763.13
--- Libc/Libc-825.26/stdlib/FreeBSD/getenv.c
+++ Libc/Libc-763.13/stdlib/FreeBSD/getenv.c
@@ -36,9 +36,8 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
-#include <crt_externs.h>
 
-__private_extern__ char *__findenv(const char *, int *, char **);
+inline char *__findenv(const char *, int *);
 
 /*
  * __findenv --
@@ -49,12 +48,12 @@
  *
  *	This routine *should* be a static; don't use it.
  */
-__private_extern__ char *
-__findenv(name, offset, environ)
+inline char *
+__findenv(name, offset)
 	const char *name;
 	int *offset;
-	char **environ;
 {
+	extern char **environ;
 	int len, i;
 	const char *np;
 	char **p, *cp;
@@ -77,19 +76,6 @@
 }
 
 /*
- * _getenvp -- SPI using an arbitrary pointer to string array (the array must
- * have been created with malloc) and an env state, created by _allocenvstate().
- *	Returns ptr to value associated with name, if any, else NULL.
- */
-char *
-_getenvp(const char *name, char ***envp, void *state __unused)
-{
-	int offset;
-
-	return (__findenv(name, &offset, *envp));
-}
-
-/*
  * getenv --
  *	Returns ptr to value associated with name, if any, else NULL.
  */
@@ -99,5 +85,5 @@
 {
 	int offset;
 
-	return (__findenv(name, &offset, *_NSGetEnviron()));
+	return (__findenv(name, &offset));
 }