Loading...
include/stdio.h Libc-1244.30.3 Libc-825.26
--- Libc/Libc-1244.30.3/include/stdio.h
+++ Libc/Libc-825.26/include/stdio.h
@@ -66,13 +66,21 @@
 
 #include <_types.h>
 
+#ifndef _VA_LIST
+#define _VA_LIST
 /* DO NOT REMOVE THIS COMMENT: fixincludes needs to see:
  * __gnuc_va_list and include <stdarg.h> */
-#include <sys/_types/_va_list.h>
-#include <sys/_types/_size_t.h>
-#include <sys/_types/_null.h>
-
-#include <sys/stdio.h>
+typedef __darwin_va_list	va_list;
+#endif
+
+#ifndef	_SIZE_T
+#define	_SIZE_T
+typedef	__darwin_size_t		size_t;
+#endif
+
+#ifndef NULL
+#define NULL __DARWIN_NULL
+#endif /* ! NULL */
 
 typedef __darwin_off_t		fpos_t;
 
@@ -130,10 +138,10 @@
 
 	/* operations */
 	void	*_cookie;	/* cookie passed to io functions */
-	int	(* _Nullable _close)(void *);
-	int	(* _Nullable _read) (void *, char *, int);
-	fpos_t	(* _Nullable _seek) (void *, fpos_t, int);
-	int	(* _Nullable _write)(void *, const char *, int);
+	int	(*_close)(void *);
+	int	(*_read) (void *, char *, int);
+	fpos_t	(*_seek) (void *, fpos_t, int);
+	int	(*_write)(void *, const char *, int);
 
 	/* separate buffer for long sequences of ungetc() */
 	struct	__sbuf _ub;	/* ungetc buffer */
@@ -237,15 +245,15 @@
 int	 fgetpos(FILE * __restrict, fpos_t *);
 char	*fgets(char * __restrict, int, FILE *);
 #if defined(_DARWIN_UNLIMITED_STREAMS) || defined(_DARWIN_C_SOURCE)
-FILE	*fopen(const char * __restrict __filename, const char * __restrict __mode) __DARWIN_ALIAS_STARTING(__MAC_10_6, __IPHONE_3_2, __DARWIN_EXTSN(fopen));
+FILE	*fopen(const char * __restrict, const char * __restrict) __DARWIN_ALIAS_STARTING(__MAC_10_6, __IPHONE_3_2, __DARWIN_EXTSN(fopen));
 #else /* !_DARWIN_UNLIMITED_STREAMS && !_DARWIN_C_SOURCE */
 //Begin-Libc
 #ifndef LIBC_ALIAS_FOPEN
 //End-Libc
-FILE	*fopen(const char * __restrict __filename, const char * __restrict __mode) __DARWIN_ALIAS_STARTING(__MAC_10_6, __IPHONE_2_0, __DARWIN_ALIAS(fopen));
+FILE	*fopen(const char * __restrict, const char * __restrict) __DARWIN_ALIAS_STARTING(__MAC_10_6, __IPHONE_2_0, __DARWIN_ALIAS(fopen));
 //Begin-Libc
 #else /* LIBC_ALIAS_FOPEN */
-FILE	*fopen(const char * __restrict __filename, const char * __restrict __mode) LIBC_ALIAS(fopen);
+FILE	*fopen(const char * __restrict, const char * __restrict) LIBC_ALIAS(fopen);
 #endif /* !LIBC_ALIAS_FOPEN */
 //End-Libc
 #endif /* (DARWIN_UNLIMITED_STREAMS || _DARWIN_C_SOURCE) */
@@ -260,7 +268,7 @@
 int	 fputs(const char * __restrict, FILE * __restrict) LIBC_ALIAS(fputs);
 #endif /* !LIBC_ALIAS_FPUTS */
 //End-Libc
-size_t	 fread(void * __restrict __ptr, size_t __size, size_t __nitems, FILE * __restrict __stream);
+size_t	 fread(void * __restrict, size_t, size_t, FILE * __restrict);
 //Begin-Libc
 #ifndef LIBC_ALIAS_FREOPEN
 //End-Libc
@@ -279,10 +287,10 @@
 //Begin-Libc
 #ifndef LIBC_ALIAS_FWRITE
 //End-Libc
-size_t	 fwrite(const void * __restrict __ptr, size_t __size, size_t __nitems, FILE * __restrict __stream) __DARWIN_ALIAS(fwrite);
+size_t	 fwrite(const void * __restrict, size_t, size_t, FILE * __restrict) __DARWIN_ALIAS(fwrite);
 //Begin-Libc
 #else /* LIBC_ALIAS_FWRITE */
-size_t	 fwrite(const void * __restrict __ptr, size_t __size, size_t __nitems, FILE * __restrict __stream) LIBC_ALIAS(fwrite);
+size_t	 fwrite(const void * __restrict, size_t, size_t, FILE * __restrict) LIBC_ALIAS(fwrite);
 #endif /* !LIBC_ALIAS_FWRITE */
 //End-Libc
 int	 getc(FILE *);
@@ -294,24 +302,19 @@
 int	 putchar(int);
 int	 puts(const char *);
 int	 remove(const char *);
-int	 rename (const char *__old, const char *__new);
+int	 rename (const char *, const char *);
 void	 rewind(FILE *);
 int	 scanf(const char * __restrict, ...) __scanflike(1, 2);
 void	 setbuf(FILE * __restrict, char * __restrict);
 int	 setvbuf(FILE * __restrict, char * __restrict, int, size_t);
-int	 sprintf(char * __restrict, const char * __restrict, ...) __printflike(2, 3) __swift_unavailable("Use snprintf instead.");
+int	 sprintf(char * __restrict, const char * __restrict, ...) __printflike(2, 3);
 int	 sscanf(const char * __restrict, const char * __restrict, ...) __scanflike(2, 3);
 FILE	*tmpfile(void);
-
-__swift_unavailable("Use mkstemp(3) instead.")
-#if !defined(_POSIX_C_SOURCE)
-__deprecated_msg("This function is provided for compatibility reasons only.  Due to security concerns inherent in the design of tmpnam(3), it is highly recommended that you use mkstemp(3) instead.")
-#endif
 char	*tmpnam(char *);
 int	 ungetc(int, FILE *);
 int	 vfprintf(FILE * __restrict, const char * __restrict, va_list) __printflike(2, 0);
 int	 vprintf(const char * __restrict, va_list) __printflike(1, 0);
-int	 vsprintf(char * __restrict, const char * __restrict, va_list) __printflike(2, 0) __swift_unavailable("Use vsnprintf instead.");
+int	 vsprintf(char * __restrict, const char * __restrict, va_list) __printflike(2, 0);
 __END_DECLS
 
 
@@ -351,22 +354,17 @@
 /* Additional functionality provided by:
  * POSIX.2-1992 C Language Binding Option
  */
-#if TARGET_OS_EMBEDDED
-#define __swift_unavailable_on(osx_msg, ios_msg) __swift_unavailable(ios_msg)
-#else
-#define __swift_unavailable_on(osx_msg, ios_msg) __swift_unavailable(osx_msg)
-#endif
 
 #if __DARWIN_C_LEVEL >= 199209L
 __BEGIN_DECLS
-int	 pclose(FILE *) __swift_unavailable_on("Use posix_spawn APIs or NSTask instead.", "Process spawning is unavailable.");
+int	 pclose(FILE *);
 #if defined(_DARWIN_UNLIMITED_STREAMS) || defined(_DARWIN_C_SOURCE)
-FILE	*popen(const char *, const char *) __DARWIN_ALIAS_STARTING(__MAC_10_6, __IPHONE_3_2, __DARWIN_EXTSN(popen)) __swift_unavailable_on("Use posix_spawn APIs or NSTask instead.", "Process spawning is unavailable.");
+FILE	*popen(const char *, const char *) __DARWIN_ALIAS_STARTING(__MAC_10_6, __IPHONE_3_2, __DARWIN_EXTSN(popen));
 #else /* !_DARWIN_UNLIMITED_STREAMS && !_DARWIN_C_SOURCE */
 //Begin-Libc
 #ifndef LIBC_ALIAS_POPEN
 //End-Libc
-FILE	*popen(const char *, const char *) __DARWIN_ALIAS_STARTING(__MAC_10_6, __IPHONE_2_0, __DARWIN_ALIAS(popen)) __swift_unavailable_on("Use posix_spawn APIs or NSTask instead.", "Process spawning is unavailable.");
+FILE	*popen(const char *, const char *) __DARWIN_ALIAS_STARTING(__MAC_10_6, __IPHONE_2_0, __DARWIN_ALIAS(popen));
 //Begin-Libc
 #else /* LIBC_ALIAS_POPEN */
 FILE	*popen(const char *, const char *) LIBC_ALIAS(popen);
@@ -376,7 +374,8 @@
 __END_DECLS
 #endif /* __DARWIN_C_LEVEL >= 199209L */
 
-#undef __swift_unavailable_on
+
+
 
 /* Additional functionality provided by:
  * POSIX.1c-1995,
@@ -399,7 +398,7 @@
  */
 #define	__sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
 #if defined(__GNUC__) && defined(__STDC__)
-__header_always_inline int __sputc(int _c, FILE *_p) {
+static __inline int __sputc(int _c, FILE *_p) {
 	if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
 		return (*_p->_p++ = _c);
 	else
@@ -439,17 +438,13 @@
 int	 putw(int, FILE *);
 #endif
 
-__swift_unavailable("Use mkstemp(3) instead.")
-#if !defined(_POSIX_C_SOURCE)
-__deprecated_msg("This function is provided for compatibility reasons only.  Due to security concerns inherent in the design of tempnam(3), it is highly recommended that you use mkstemp(3) instead.")
-#endif
 //Begin-Libc
 #ifndef LIBC_ALIAS_TEMPNAM
 //End-Libc
-char	*tempnam(const char *__dir, const char *__prefix) __DARWIN_ALIAS(tempnam);
+char	*tempnam(const char *, const char *) __DARWIN_ALIAS(tempnam);
 //Begin-Libc
 #else /* LIBC_ALIAS_TEMPNAM */
-char	*tempnam(const char *__dir, const char *__prefix) LIBC_ALIAS(tempnam);
+char	*tempnam(const char *, const char *) LIBC_ALIAS(tempnam);
 #endif /* !LIBC_ALIAS_TEMPNAM */
 //End-Libc
 __END_DECLS
@@ -471,21 +466,24 @@
  */
 
 #if __DARWIN_C_LEVEL >= 200112L
-#include <sys/_types/_off_t.h>
-
-__BEGIN_DECLS
-int	 fseeko(FILE * __stream, off_t __offset, int __whence);
-off_t	 ftello(FILE * __stream);
+#ifndef	_OFF_T
+#define	_OFF_T
+typedef	__darwin_off_t		off_t;
+#endif
+
+__BEGIN_DECLS
+int	 fseeko(FILE *, off_t, int);
+off_t	 ftello(FILE *);
 __END_DECLS
 #endif /* __DARWIN_C_LEVEL >= 200112L */
 
 #if __DARWIN_C_LEVEL >= 200112L || defined(_C99_SOURCE) || defined(__cplusplus)
 __BEGIN_DECLS
-int	 snprintf(char * __restrict __str, size_t __size, const char * __restrict __format, ...) __printflike(3, 4);
-int	 vfscanf(FILE * __restrict __stream, const char * __restrict __format, va_list) __scanflike(2, 0);
-int	 vscanf(const char * __restrict __format, va_list) __scanflike(1, 0);
-int	 vsnprintf(char * __restrict __str, size_t __size, const char * __restrict __format, va_list) __printflike(3, 0);
-int	 vsscanf(const char * __restrict __str, const char * __restrict __format, va_list) __scanflike(2, 0);
+int	 snprintf(char * __restrict, size_t, const char * __restrict, ...) __printflike(3, 4);
+int	 vfscanf(FILE * __restrict, const char * __restrict, va_list) __scanflike(2, 0);
+int	 vscanf(const char * __restrict, va_list) __scanflike(1, 0);
+int	 vsnprintf(char * __restrict, size_t, const char * __restrict, va_list) __printflike(3, 0);
+int	 vsscanf(const char * __restrict, const char * __restrict, va_list) __scanflike(2, 0);
 __END_DECLS
 #endif /* __DARWIN_C_LEVEL >= 200112L || defined(_C99_SOURCE) || defined(__cplusplus) */
 
@@ -496,15 +494,16 @@
  */
 
 #if __DARWIN_C_LEVEL >= 200809L
-#include <sys/_types/_ssize_t.h>
+#ifndef _SSIZE_T
+#define _SSIZE_T
+typedef __darwin_ssize_t        ssize_t;
+#endif
 
 __BEGIN_DECLS
 int	dprintf(int, const char * __restrict, ...) __printflike(2, 3) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
 int	vdprintf(int, const char * __restrict, va_list) __printflike(2, 0) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
-ssize_t getdelim(char ** __restrict __linep, size_t * __restrict __linecapp, int __delimiter, FILE * __restrict __stream) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
-ssize_t getline(char ** __restrict __linep, size_t * __restrict __linecapp, FILE * __restrict __stream) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
-FILE *fmemopen(void * __restrict __buf, size_t __size, const char * __restrict __mode) __API_AVAILABLE(macos(10.13), ios(11.0), tvos(11.0), watchos(4.0));
-FILE *open_memstream(char **__bufp, size_t *__sizep) __API_AVAILABLE(macos(10.13), ios(11.0), tvos(11.0), watchos(4.0));
+ssize_t getdelim(char ** __restrict, size_t * __restrict, int, FILE * __restrict) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
+ssize_t getline(char ** __restrict, size_t * __restrict, FILE * __restrict) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
 __END_DECLS
 #endif /* __DARWIN_C_LEVEL >= 200809L */
 
@@ -517,14 +516,14 @@
 extern __const int sys_nerr;		/* perror(3) external variables */
 extern __const char *__const sys_errlist[];
 
-int	 asprintf(char ** __restrict, const char * __restrict, ...) __printflike(2, 3);
+int	 asprintf(char **, const char *, ...) __printflike(2, 3);
 char	*ctermid_r(char *);
 char	*fgetln(FILE *, size_t *);
 __const char *fmtcheck(const char *, const char *);
 int	 fpurge(FILE *);
 void	 setbuffer(FILE *, char *, int);
 int	 setlinebuf(FILE *);
-int	 vasprintf(char ** __restrict, const char * __restrict, va_list) __printflike(2, 0);
+int	 vasprintf(char **, const char *, va_list) __printflike(2, 0);
 FILE	*zopen(const char *, const char *, int);
 
 
@@ -532,10 +531,10 @@
  * Stdio function-access interface.
  */
 FILE	*funopen(const void *,
-                 int (* _Nullable)(void *, char *, int),
-                 int (* _Nullable)(void *, const char *, int),
-                 fpos_t (* _Nullable)(void *, fpos_t, int),
-                 int (* _Nullable)(void *));
+                 int (*)(void *, char *, int),
+                 int (*)(void *, const char *, int),
+                 fpos_t (*)(void *, fpos_t, int),
+                 int (*)(void *));
 __END_DECLS
 #define	fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
 #define	fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)