Retire the __fgetcookie(), __fgetpendout(), and __fsetfileno() accessors

as we aren't hiding FILE's internals anymore.

4 files changed, 0 insertions, 36 deletions

diff --git a/include/stdio.h b/include/stdio.h
index 9934b17..c2c32eb 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -346,12 +346,6 @@ int	 setlinebuf(FILE *);
 int	 vasprintf(char **, const char *, __va_list)
 	    __printflike(2, 0);
 
-/* XXX used by libftpio */
-void	*__fgetcookie(FILE *);
-void	__fsetfileno(FILE *, int);
-/* XXX used by sort */
-size_t	__fgetpendout(FILE *);
-
 /*
  * The system error table contains messages for the first sys_nerr
  * positive errno values.  Use strerror() or strerror_r() from <string.h>
diff --git a/lib/libc/Versions.def b/lib/libc/Versions.def
index 48f2568..eb923dc 100644
--- a/lib/libc/Versions.def
+++ b/lib/libc/Versions.def
@@ -15,6 +15,3 @@ FBSD_1.1 {
 # simple ABI-checking tools.
 FBSDprivate_1.0 {
 } FBSD_1.0;
-
-FBSDprivate_1.1 {
-} FBSD_1.1;
diff --git a/lib/libc/stdio/Symbol.map b/lib/libc/stdio/Symbol.map
index b8e3099..ac93cb2 100644
--- a/lib/libc/stdio/Symbol.map
+++ b/lib/libc/stdio/Symbol.map
@@ -149,9 +149,3 @@ FBSDprivate_1.0 {
 	__printf_arginfo_vis;
 	__printf_render_vis;
 };
-
-FBSDprivate_1.1 {
-	__fgetcookie;
-	__fgetpendout;
-	__fsetfileno;
-};
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c
index b6d01e3..2447d18 100644
--- a/lib/libc/stdio/stdio.c
+++ b/lib/libc/stdio/stdio.c
@@ -46,27 +46,6 @@ __FBSDID("$FreeBSD$");
 #include "un-namespace.h"
 #include "local.h"
 
-void *
-__fgetcookie(FILE *fp)
-{
-
-	return (fp->_cookie);
-}
-
-size_t
-__fgetpendout(FILE *fp)
-{
-
-	return (fp->_p - fp->_bf._base);
-}
-
-void
-__fsetfileno(FILE *fp, int fd)
-{
-
-	fp->_file = fd;
-}
-
 /*
  * Small standard I/O/seek/close functions.
  */