[BACK]Return to stdio.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / include

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/include/stdio.h between version 1.77 and 1.86

version 1.77, 2010/09/06 14:52:26 version 1.86, 2013/04/19 23:42:26
Line 41 
Line 41 
 #include <sys/featuretest.h>  #include <sys/featuretest.h>
 #include <sys/ansi.h>  #include <sys/ansi.h>
   
 #include <machine/ansi.h>  
 #ifdef  _BSD_SIZE_T_  #ifdef  _BSD_SIZE_T_
 typedef _BSD_SIZE_T_    size_t;  typedef _BSD_SIZE_T_    size_t;
 #undef  _BSD_SIZE_T_  #undef  _BSD_SIZE_T_
Line 51  typedef _BSD_SSIZE_T_ ssize_t;
Line 50  typedef _BSD_SSIZE_T_ ssize_t;
 #undef  _BSD_SSIZE_T_  #undef  _BSD_SSIZE_T_
 #endif  #endif
   
   #if defined(_POSIX_C_SOURCE)
   #ifndef __VA_LIST_DECLARED
   typedef __va_list va_list;
   #define __VA_LIST_DECLARED
   #endif
   #endif
   
 #include <sys/null.h>  #include <sys/null.h>
   
 /*  /*
Line 58  typedef _BSD_SSIZE_T_ ssize_t;
Line 64  typedef _BSD_SSIZE_T_ ssize_t;
  * innards of an fpos_t anyway.  The library internally uses off_t,   * innards of an fpos_t anyway.  The library internally uses off_t,
  * which we assume is exactly as big as eight chars.   * which we assume is exactly as big as eight chars.
  */   */
 #if (!defined(_ANSI_SOURCE) && !defined(__STRICT_ANSI__)) || defined(_LIBC)  
 typedef __off_t fpos_t;  
 #else  
 typedef struct __sfpos {  typedef struct __sfpos {
         __off_t _pos;          __off_t _pos;
           __mbstate_t _mbstate_in, _mbstate_out;
 } fpos_t;  } fpos_t;
 #endif  
   
 #define _FSTDIO                 /* Define for new stdio with functions. */  #define _FSTDIO                 /* Define for new stdio with functions. */
   
Line 118  typedef struct __sFILE {
Line 121  typedef struct __sFILE {
         /* operations */          /* operations */
         void    *_cookie;       /* cookie passed to io functions */          void    *_cookie;       /* cookie passed to io functions */
         int     (*_close)(void *);          int     (*_close)(void *);
         int     (*_read) (void *, char *, int);          ssize_t (*_read) (void *, void *, size_t);
         fpos_t  (*_seek) (void *, fpos_t, int);          __off_t (*_seek) (void *, __off_t, int);
         int     (*_write)(void *, const char *, int);          ssize_t (*_write)(void *, const void *, size_t);
   
         /* file extension */          /* file extension */
         struct  __sbuf _ext;          struct  __sbuf _ext;
Line 133  typedef struct __sFILE {
Line 136  typedef struct __sFILE {
         unsigned char _ubuf[3]; /* guarantee an ungetc() buffer */          unsigned char _ubuf[3]; /* guarantee an ungetc() buffer */
         unsigned char _nbuf[1]; /* guarantee a getc() buffer */          unsigned char _nbuf[1]; /* guarantee a getc() buffer */
   
           int     (*_flush)(void *);
         /* Formerly used by fgetln/fgetwln; kept for binary compatibility */          /* Formerly used by fgetln/fgetwln; kept for binary compatibility */
         struct  __sbuf _lb__unused;          char    _lb_unused[sizeof(struct __sbuf) - sizeof(int (*)(void *))];
   
         /* Unix stdio files get aligned to block boundaries on fseek() */          /* Unix stdio files get aligned to block boundaries on fseek() */
         int     _blksize;       /* stat.st_blksize (may be != _bf._size) */          int     _blksize;       /* stat.st_blksize (may be != _bf._size) */
         fpos_t  _offset;        /* current lseek offset */          __off_t _offset;        /* current lseek offset */
 } FILE;  } FILE;
   
 __BEGIN_DECLS  __BEGIN_DECLS
 extern FILE __sF[];  extern FILE __sF[3];
 __END_DECLS  __END_DECLS
   
 #define __SLBF  0x0001          /* line buffered */  #define __SLBF  0x0001          /* line buffered */
Line 222  int  feof(FILE *);
Line 226  int  feof(FILE *);
 int      ferror(FILE *);  int      ferror(FILE *);
 int      fflush(FILE *);  int      fflush(FILE *);
 int      fgetc(FILE *);  int      fgetc(FILE *);
 int      fgetpos(FILE * __restrict, fpos_t * __restrict);  
 char    *fgets(char * __restrict, int, FILE * __restrict);  char    *fgets(char * __restrict, int, FILE * __restrict);
 FILE    *fopen(const char * __restrict , const char * __restrict);  FILE    *fopen(const char * __restrict , const char * __restrict);
 int      fprintf(FILE * __restrict , const char * __restrict, ...)  int      fprintf(FILE * __restrict, const char * __restrict, ...)
                 __printflike(2, 3);                  __printflike(2, 3);
 int      fputc(int, FILE *);  int      fputc(int, FILE *);
 int      fputs(const char * __restrict, FILE * __restrict);  int      fputs(const char * __restrict, FILE * __restrict);
Line 235  FILE *freopen(const char * __restrict, c
Line 238  FILE *freopen(const char * __restrict, c
 int      fscanf(FILE * __restrict, const char * __restrict, ...)  int      fscanf(FILE * __restrict, const char * __restrict, ...)
                 __scanflike(2, 3);                  __scanflike(2, 3);
 int      fseek(FILE *, long, int);  int      fseek(FILE *, long, int);
 int      fsetpos(FILE *, const fpos_t *);  
 long     ftell(FILE *);  long     ftell(FILE *);
 size_t   fwrite(const void * __restrict, size_t, size_t, FILE * __restrict);  size_t   fwrite(const void * __restrict, size_t, size_t, FILE * __restrict);
 int      getc(FILE *);  int      getc(FILE *);
Line 259  int  sscanf(const char * __restrict, con
Line 261  int  sscanf(const char * __restrict, con
                 __scanflike(2, 3);                  __scanflike(2, 3);
 FILE    *tmpfile(void);  FILE    *tmpfile(void);
 int      ungetc(int, FILE *);  int      ungetc(int, FILE *);
 int      vfprintf(FILE * __restrict, const char * __restrict, _BSD_VA_LIST_)  int      vfprintf(FILE * __restrict, const char * __restrict, __va_list)
                 __printflike(2, 0);                  __printflike(2, 0);
 int      vprintf(const char * __restrict, _BSD_VA_LIST_)  int      vprintf(const char * __restrict, __va_list)
                 __printflike(1, 0);                  __printflike(1, 0);
   
 #ifndef __AUDIT__  #ifndef __AUDIT__
Line 270  int  sprintf(char * __restrict, const ch
Line 272  int  sprintf(char * __restrict, const ch
                 __printflike(2, 3);                  __printflike(2, 3);
 char    *tmpnam(char *);  char    *tmpnam(char *);
 int      vsprintf(char * __restrict, const char * __restrict,  int      vsprintf(char * __restrict, const char * __restrict,
     _BSD_VA_LIST_)      __va_list)
                 __printflike(2, 0);                  __printflike(2, 0);
 #endif  #endif
   
Line 281  int  rename (const char *, const char *)
Line 283  int  rename (const char *, const char *)
 #endif  #endif
 __END_DECLS  __END_DECLS
   
   #ifndef __LIBC12_SOURCE__
   int      fgetpos(FILE * __restrict, fpos_t * __restrict) __RENAME(__fgetpos50);
   int      fsetpos(FILE *, const fpos_t *) __RENAME(__fsetpos50);
   #endif
 /*  /*
  * IEEE Std 1003.1-90   * IEEE Std 1003.1-90
  */   */
Line 340  __BEGIN_DECLS
Line 346  __BEGIN_DECLS
 int      snprintf(char * __restrict, size_t, const char * __restrict, ...)  int      snprintf(char * __restrict, size_t, const char * __restrict, ...)
                 __printflike(3, 4);                  __printflike(3, 4);
 int      vsnprintf(char * __restrict, size_t, const char * __restrict,  int      vsnprintf(char * __restrict, size_t, const char * __restrict,
             _BSD_VA_LIST_)              __va_list)
                 __printflike(3, 0);                  __printflike(3, 0);
 __END_DECLS  __END_DECLS
 #endif  #endif
Line 381  __END_DECLS
Line 387  __END_DECLS
  */   */
 #if defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)  #if defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)
 __BEGIN_DECLS  __BEGIN_DECLS
 int      vscanf(const char * __restrict, _BSD_VA_LIST_)  int      vscanf(const char * __restrict, __va_list)
                 __scanflike(1, 0);                  __scanflike(1, 0);
 int      vfscanf(FILE * __restrict, const char * __restrict, _BSD_VA_LIST_)  int      vfscanf(FILE * __restrict, const char * __restrict, __va_list)
                 __scanflike(2, 0);                  __scanflike(2, 0);
 int      vsscanf(const char * __restrict, const char * __restrict,  int      vsscanf(const char * __restrict, const char * __restrict,
     _BSD_VA_LIST_)      __va_list)
     __scanflike(2, 0);      __scanflike(2, 0);
 __END_DECLS  __END_DECLS
 #endif /* _ISOC99_SOURCE || _NETBSD_SOURCE */  #endif /* _ISOC99_SOURCE || _NETBSD_SOURCE */
Line 411  int  fpurge(FILE *);
Line 417  int  fpurge(FILE *);
 void     setbuffer(FILE *, char *, int);  void     setbuffer(FILE *, char *, int);
 int      setlinebuf(FILE *);  int      setlinebuf(FILE *);
 int      vasprintf(char ** __restrict, const char * __restrict,  int      vasprintf(char ** __restrict, const char * __restrict,
     _BSD_VA_LIST_)      __va_list)
                 __printflike(2, 0);                  __printflike(2, 0);
 const char *fmtcheck(const char *, const char *)  const char *fmtcheck(const char *, const char *)
                 __format_arg(2);                  __format_arg(2);
Line 422  __END_DECLS
Line 428  __END_DECLS
  */   */
 __BEGIN_DECLS  __BEGIN_DECLS
 FILE    *funopen(const void *,  FILE    *funopen(const void *,
                 int (*)(void *, char *, int),      int (*)(void *, char *, int),
                 int (*)(void *, const char *, int),      int (*)(void *, const char *, int),
                 fpos_t (*)(void *, fpos_t, int),      off_t (*)(void *, off_t, int),
                 int (*)(void *));      int (*)(void *));
   FILE    *funopen2(const void *,
       ssize_t (*)(void *, void *, size_t),
       ssize_t (*)(void *, const void *, size_t),
       off_t (*)(void *, off_t, int),
       int (*)(void *),
       int (*)(void *));
 __END_DECLS  __END_DECLS
 #define fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)  #define fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
 #define fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)  #define fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
   #define fropen2(cookie, fn) funopen2(cookie, fn, 0, 0, 0, 0)
   #define fwopen2(cookie, fn) funopen2(cookie, 0, fn, 0, 0, 0)
 #endif /* _NETBSD_SOURCE */  #endif /* _NETBSD_SOURCE */
   
 /*  /*
Line 493  static __inline int __sputc(int _c, FILE
Line 507  static __inline int __sputc(int _c, FILE
 #endif /* !_ANSI_SOURCE */  #endif /* !_ANSI_SOURCE */
   
 #if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)  #if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)
 int      vdprintf(int, const char * __restrict, _BSD_VA_LIST_)  int      vdprintf(int, const char * __restrict, __va_list)
                 __printflike(2, 0);                  __printflike(2, 0);
 int      dprintf(int, const char * __restrict, ...)  int      dprintf(int, const char * __restrict, ...)
                 __printflike(2, 3);                  __printflike(2, 3);
Line 508  int  dprintf(int, const char * __restric
Line 522  int  dprintf(int, const char * __restric
 #define putchar_unlocked(x)     putc_unlocked(x, stdout)  #define putchar_unlocked(x)     putc_unlocked(x, stdout)
 #endif /* _POSIX_C_SOURCE >= 199506 || _XOPEN_SOURCE >= 500 || _REENTRANT... */  #endif /* _POSIX_C_SOURCE >= 199506 || _XOPEN_SOURCE >= 500 || _REENTRANT... */
   
   #if (_POSIX_C_SOURCE - 0) >= 200809L || (_XOPEN_SOURCE - 0) >= 700 || \
       defined(_NETBSD_SOURCE)
   FILE *fmemopen(void * __restrict, size_t, const char * __restrict);
   #endif
   
   #if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)
   #  ifndef __LOCALE_T_DECLARED
   typedef struct _locale          *locale_t;
   #  define __LOCALE_T_DECLARED
   #  endif
   __BEGIN_DECLS
   int      fprintf_l(FILE * __restrict, locale_t, const char * __restrict, ...)
                   __printflike(3, 4);
   int      vfprintf_l(FILE * __restrict, locale_t, const char * __restrict,
                   __va_list) __printflike(3, 0);
   int      printf_l(locale_t, const char * __restrict, ...)
                   __printflike(2, 3);
   int      vprintf_l(locale_t, const char * __restrict, __va_list)
                   __printflike(2, 0);
   int      asprintf_l(char ** __restrict, locale_t, const char * __restrict, ...)
                   __printflike(3, 4);
   int      vasprintf_l(char ** __restrict, locale_t, const char * __restrict,
       __va_list)
                   __printflike(3, 0);
   int      vdprintf_l(int, locale_t, const char * __restrict, __va_list)
                   __printflike(3, 0);
   int      dprintf_l(int, locale_t, const char * __restrict, ...)
                   __printflike(3, 4);
   int      snprintf_l(char * __restrict, size_t, locale_t,
                       const char * __restrict, ...) __printflike(4, 5);
   int      vsnprintf_l(char * __restrict, size_t, locale_t,
                        const char * __restrict, __va_list) __printflike(4, 0);
   #ifndef __AUDIT__
   int      sprintf_l(char * __restrict, locale_t, const char * __restrict, ...)
                      __printflike(3, 4);
   int      vsprintf_l(char * __restrict, locale_t, const char * __restrict,
                       __va_list) __printflike(3, 0);
   #endif
   
   int      fscanf_l(FILE * __restrict, locale_t, const char * __restrict, ...)
       __scanflike(3, 4);
   int      scanf_l(locale_t, const char * __restrict, ...)
       __scanflike(2, 3);
   int      sscanf_l(const char * __restrict, locale_t,
       const char * __restrict, ...) __scanflike(3, 4);
   int      vscanf_l(locale_t, const char * __restrict, __va_list)
       __scanflike(2, 0);
   int      vscanf_l(locale_t, const char * __restrict, __va_list)
       __scanflike(2, 0);
   int      vfscanf_l(FILE * __restrict, locale_t, const char * __restrict,
       __va_list) __scanflike(3, 0);
   int      vsscanf_l(const char * __restrict, locale_t, const char * __restrict,
       __va_list) __scanflike(3, 0);
   __END_DECLS
   #endif
   
 #if _FORTIFY_SOURCE > 0  #if _FORTIFY_SOURCE > 0
 #include <ssp/stdio.h>  #include <ssp/stdio.h>
 #endif  #endif

Legend:
Removed from v.1.77  
changed lines
  Added in v.1.86

CVSweb <webmaster@jp.NetBSD.org>