reduce isc/stdio to what is used

OK tedu

2 files changed, 2 insertions, 146 deletions

diff --git a/usr.sbin/bind/lib/isc/include/isc/stdio.h b/usr.sbin/bind/lib/isc/include/isc/stdio.h
index 9ccd1980e1c..22f056ce7a5 100644
--- a/usr.sbin/bind/lib/isc/include/isc/stdio.h
+++ b/usr.sbin/bind/lib/isc/include/isc/stdio.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdio.h,v 1.3 2019/12/17 01:46:35 sthen Exp $ */
+/* $Id: stdio.h,v 1.4 2020/01/26 11:26:30 florian Exp $ */
 
 #ifndef ISC_STDIO_H
 #define ISC_STDIO_H 1
@@ -41,40 +41,6 @@ ISC_LANG_BEGINDECLS
 isc_result_t
 isc_stdio_open(const char *filename, const char *mode, FILE **fp);
 
-/*% Close */
-isc_result_t
-isc_stdio_close(FILE *f);
-
-/*% Seek */
-isc_result_t
-isc_stdio_seek(FILE *f, off_t offset, int whence);
-
-/*% Tell */
-isc_result_t
-isc_stdio_tell(FILE *f, off_t *offsetp);
-
-/*% Read */
-isc_result_t
-isc_stdio_read(void *ptr, size_t size, size_t nmemb, FILE *f,
-	       size_t *nret);
-
-/*% Write */
-isc_result_t
-isc_stdio_write(const void *ptr, size_t size, size_t nmemb, FILE *f,
-		size_t *nret);
-
-/*% Flush */
-isc_result_t
-isc_stdio_flush(FILE *f);
-
-isc_result_t
-isc_stdio_sync(FILE *f);
-/*%<
- * Invoke fsync() on the file descriptor underlying an stdio stream, or an
- * equivalent system-dependent operation.  Note that this function has no
- * direct counterpart in the stdio library.
- */
-
 ISC_LANG_ENDDECLS
 
 #endif /* ISC_STDIO_H */
diff --git a/usr.sbin/bind/lib/isc/unix/stdio.c b/usr.sbin/bind/lib/isc/unix/stdio.c
index cf1ee755358..3e4b1ba2c82 100644
--- a/usr.sbin/bind/lib/isc/unix/stdio.c
+++ b/usr.sbin/bind/lib/isc/unix/stdio.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdio.c,v 1.5 2020/01/22 13:02:10 florian Exp $ */
+/* $Id: stdio.c,v 1.6 2020/01/26 11:26:30 florian Exp $ */
 
 
 
@@ -37,113 +37,3 @@ isc_stdio_open(const char *filename, const char *mode, FILE **fp) {
 	*fp = f;
 	return (ISC_R_SUCCESS);
 }
-
-isc_result_t
-isc_stdio_close(FILE *f) {
-	int r;
-
-	r = fclose(f);
-	if (r == 0)
-		return (ISC_R_SUCCESS);
-	else
-		return (isc__errno2result(errno));
-}
-
-isc_result_t
-isc_stdio_seek(FILE *f, off_t offset, int whence) {
-	int r;
-
-	r = fseeko(f, offset, whence);
-	if (r == 0)
-		return (ISC_R_SUCCESS);
-	else
-		return (isc__errno2result(errno));
-}
-
-isc_result_t
-isc_stdio_tell(FILE *f, off_t *offsetp) {
-	off_t r;
-
-	REQUIRE(offsetp != NULL);
-
-	r = ftello(f);
-	if (r >= 0) {
-		*offsetp = r;
-		return (ISC_R_SUCCESS);
-	} else
-		return (isc__errno2result(errno));
-}
-
-isc_result_t
-isc_stdio_read(void *ptr, size_t size, size_t nmemb, FILE *f, size_t *nret) {
-	isc_result_t result = ISC_R_SUCCESS;
-	size_t r;
-
-	clearerr(f);
-	r = fread(ptr, size, nmemb, f);
-	if (r != nmemb) {
-		if (feof(f))
-			result = ISC_R_EOF;
-		else
-			result = isc__errno2result(errno);
-	}
-	if (nret != NULL)
-		*nret = r;
-	return (result);
-}
-
-isc_result_t
-isc_stdio_write(const void *ptr, size_t size, size_t nmemb, FILE *f,
-	       size_t *nret)
-{
-	isc_result_t result = ISC_R_SUCCESS;
-	size_t r;
-
-	clearerr(f);
-	r = fwrite(ptr, size, nmemb, f);
-	if (r != nmemb)
-		result = isc__errno2result(errno);
-	if (nret != NULL)
-		*nret = r;
-	return (result);
-}
-
-isc_result_t
-isc_stdio_flush(FILE *f) {
-	int r;
-
-	r = fflush(f);
-	if (r == 0)
-		return (ISC_R_SUCCESS);
-	else
-		return (isc__errno2result(errno));
-}
-
-/*
- * OpenBSD has deprecated ENOTSUP in favor of EOPNOTSUPP.
- */
-#if defined(EOPNOTSUPP) && !defined(ENOTSUP)
-#define ENOTSUP EOPNOTSUPP
-#endif
-
-isc_result_t
-isc_stdio_sync(FILE *f) {
-	struct stat buf;
-	int r;
-
-	if (fstat(fileno(f), &buf) != 0)
-		return (isc__errno2result(errno));
-
-	/*
-	 * Only call fsync() on regular files.
-	 */
-	if ((buf.st_mode & S_IFMT) != S_IFREG)
-		return (ISC_R_SUCCESS);
-
-	r = fsync(fileno(f));
-	if (r == 0)
-		return (ISC_R_SUCCESS);
-	else
-		return (isc__errno2result(errno));
-}
-