Libc-1044.40.1.tar.gz

[apple/libc.git] / include / stdio.h

diff --git a/include/stdio.h b/include/stdio.h
index b2860ed6b593eec7ab40e9d98e47577e1cdf9c5b..adc59ed82af251a6f2ae4187c04527ca3f7bdf7c 100644 (file)
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -66,21 +66,13 @@
 
 #include <_types.h>
 
 
 #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> */
 /* DO NOT REMOVE THIS COMMENT: fixincludes needs to see:
  * __gnuc_va_list and include <stdarg.h> */

-typedef __darwin_va_list       va_list;
-#endif
-
-#ifndef        _SIZE_T
-#define        _SIZE_T
-typedef        __darwin_size_t         size_t;
-#endif
+#include <sys/_types/_va_list.h>
+#include <sys/_types/_size_t.h>
+#include <sys/_types/_null.h>

 
 

-#ifndef NULL
-#define NULL __DARWIN_NULL
-#endif /* ! NULL */
+#include <sys/stdio.h>

 
 typedef __darwin_off_t         fpos_t;
 
 
 typedef __darwin_off_t         fpos_t;
 


@@ -310,6 +302,10 @@ int         setvbuf(FILE * __restrict, char * __restrict, int, size_t);
 int     sprintf(char * __restrict, const char * __restrict, ...) __printflike(2, 3);
 int     sscanf(const char * __restrict, const char * __restrict, ...) __scanflike(2, 3);
 FILE   *tmpfile(void);
 int     sprintf(char * __restrict, const char * __restrict, ...) __printflike(2, 3);
 int     sscanf(const char * __restrict, const char * __restrict, ...) __scanflike(2, 3);
 FILE   *tmpfile(void);

+
+#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);
 char   *tmpnam(char *);
 int     ungetc(int, FILE *);
 int     vfprintf(FILE * __restrict, const char * __restrict, va_list) __printflike(2, 0);


@@ -398,7 +394,7 @@ __END_DECLS
  */
 #define        __sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
 #if defined(__GNUC__) && defined(__STDC__)
  */
 #define        __sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
 #if defined(__GNUC__) && defined(__STDC__)

-static __inline int __sputc(int _c, FILE *_p) {
+__header_always_inline int __sputc(int _c, FILE *_p) {

        if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
                return (*_p->_p++ = _c);
        else
        if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
                return (*_p->_p++ = _c);
        else


@@ -438,6 +434,9 @@ int  getw(FILE *);
 int     putw(int, FILE *);
 #endif
 
 int     putw(int, FILE *);
 #endif
 

+#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
 //Begin-Libc
 #ifndef LIBC_ALIAS_TEMPNAM
 //End-Libc


@@ -466,10 +465,7 @@ __END_DECLS
  */
 
 #if __DARWIN_C_LEVEL >= 200112L
  */
 
 #if __DARWIN_C_LEVEL >= 200112L

-#ifndef        _OFF_T
-#define        _OFF_T
-typedef        __darwin_off_t          off_t;
-#endif
+#include <sys/_types/_off_t.h>

 
 __BEGIN_DECLS
 int     fseeko(FILE *, off_t, int);
 
 __BEGIN_DECLS
 int     fseeko(FILE *, off_t, int);


@@ -494,10 +490,7 @@ __END_DECLS
  */
 
 #if __DARWIN_C_LEVEL >= 200809L
  */
 
 #if __DARWIN_C_LEVEL >= 200809L

-#ifndef _SSIZE_T
-#define _SSIZE_T
-typedef __darwin_ssize_t        ssize_t;
-#endif
+#include <sys/_types/_ssize_t.h>

 
 __BEGIN_DECLS
 int    dprintf(int, const char * __restrict, ...) __printflike(2, 3) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
 
 __BEGIN_DECLS
 int    dprintf(int, const char * __restrict, ...) __printflike(2, 3) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);


@@ -516,14 +509,14 @@ __BEGIN_DECLS
 extern __const int sys_nerr;           /* perror(3) external variables */
 extern __const char *__const sys_errlist[];
 
 extern __const int sys_nerr;           /* perror(3) external variables */
 extern __const char *__const sys_errlist[];
 

-int     asprintf(char **, const char *, ...) __printflike(2, 3);
+int     asprintf(char ** __restrict, const char * __restrict, ...) __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 *);
 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 **, const char *, va_list) __printflike(2, 0);
+int     vasprintf(char ** __restrict, const char * __restrict, va_list) __printflike(2, 0);

 FILE   *zopen(const char *, const char *, int);
 
 
 FILE   *zopen(const char *, const char *, int);