[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.62 and 1.75.2.1

version 1.62, 2005/12/24 19:16:02 version 1.75.2.1, 2010/04/30 14:36:18
Line 46 
Line 46 
 typedef _BSD_SIZE_T_    size_t;  typedef _BSD_SIZE_T_    size_t;
 #undef  _BSD_SIZE_T_  #undef  _BSD_SIZE_T_
 #endif  #endif
   #ifdef  _BSD_SSIZE_T_
   typedef _BSD_SSIZE_T_   ssize_t;
   #undef  _BSD_SSIZE_T_
   #endif
   
 #include <sys/null.h>  #include <sys/null.h>
   
Line 106  typedef struct __sFILE {
Line 110  typedef struct __sFILE {
         unsigned char *_p;      /* current position in (some) buffer */          unsigned char *_p;      /* current position in (some) buffer */
         int     _r;             /* read space left for getc() */          int     _r;             /* read space left for getc() */
         int     _w;             /* write space left for putc() */          int     _w;             /* write space left for putc() */
         short   _flags;         /* flags, below; this FILE is free if 0 */          unsigned short _flags;  /* flags, below; this FILE is free if 0 */
         short   _file;          /* fileno, if Unix descriptor, else -1 */          short   _file;          /* fileno, if Unix descriptor, else -1 */
         struct  __sbuf _bf;     /* the buffer (at least 1 byte, if !NULL) */          struct  __sbuf _bf;     /* the buffer (at least 1 byte, if !NULL) */
         int     _lbfsize;       /* 0 or -_bf._size, for inline putc */          int     _lbfsize;       /* 0 or -_bf._size, for inline putc */
Line 129  typedef struct __sFILE {
Line 133  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 */
   
         /* separate buffer for fgetln() when line crosses buffer boundary */          /* Formerly used by fgetln/fgetwln; kept for binary compatibility */
         struct  __sbuf _lb;     /* buffer for fgetln() */          struct  __sbuf _lb__unused;
   
         /* 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) */
Line 221  int  fgetc(FILE *);
Line 225  int  fgetc(FILE *);
 int      fgetpos(FILE * __restrict, fpos_t * __restrict);  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);
 int      fputc(int, FILE *);  int      fputc(int, FILE *);
 int      fputs(const char * __restrict, FILE * __restrict);  int      fputs(const char * __restrict, FILE * __restrict);
 size_t   fread(void * __restrict, size_t, size_t, FILE * __restrict);  size_t   fread(void * __restrict, size_t, size_t, FILE * __restrict);
 FILE    *freopen(const char * __restrict, const char * __restrict,  FILE    *freopen(const char * __restrict, const char * __restrict,
             FILE * __restrict);              FILE * __restrict);
 int      fscanf(FILE * __restrict, const char * __restrict, ...);  int      fscanf(FILE * __restrict, const char * __restrict, ...)
                   __scanflike(2, 3);
 int      fseek(FILE *, long, int);  int      fseek(FILE *, long, int);
 int      fsetpos(FILE *, const fpos_t *);  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 *);
 int      getchar(void);  int      getchar(void);
   ssize_t  getdelim(char ** __restrict, size_t * __restrict, int,
               FILE * __restrict);
   ssize_t  getline(char ** __restrict, size_t * __restrict, FILE * __restrict);
 void     perror(const char *);  void     perror(const char *);
 int      printf(const char * __restrict, ...);  int      printf(const char * __restrict, ...)
                   __printflike(1, 2);
 int      putc(int, FILE *);  int      putc(int, FILE *);
 int      putchar(int);  int      putchar(int);
 int      puts(const char *);  int      puts(const char *);
 int      remove(const char *);  int      remove(const char *);
 void     rewind(FILE *);  void     rewind(FILE *);
 int      scanf(const char * __restrict, ...);  int      scanf(const char * __restrict, ...)
                   __scanflike(1, 2);
 void     setbuf(FILE * __restrict, char * __restrict);  void     setbuf(FILE * __restrict, char * __restrict);
 int      setvbuf(FILE * __restrict, char * __restrict, int, size_t);  int      setvbuf(FILE * __restrict, char * __restrict, int, size_t);
 int      sscanf(const char * __restrict, const char * __restrict, ...);  int      sscanf(const char * __restrict, const char * __restrict, ...)
                   __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, _BSD_VA_LIST_)
 int      vprintf(const char * __restrict, _BSD_VA_LIST_);                  __printflike(2, 0);
   int      vprintf(const char * __restrict, _BSD_VA_LIST_)
                   __printflike(1, 0);
   
 #ifndef __AUDIT__  #ifndef __AUDIT__
 char    *gets(char *);  char    *gets(char *);
 int      sprintf(char * __restrict, const char * __restrict, ...);  int      sprintf(char * __restrict, const char * __restrict, ...)
                   __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_);      _BSD_VA_LIST_)
                   __printflike(2, 0);
 #endif  #endif
   
 #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE)  #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE)
Line 315  __END_DECLS
Line 331  __END_DECLS
 /*  /*
  * Functions defined in ISO XPG4.2, ISO C99, POSIX 1003.1-2001 or later.   * Functions defined in ISO XPG4.2, ISO C99, POSIX 1003.1-2001 or later.
  */   */
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \  #if ((__STDC_VERSION__ - 0) >= 199901L) || \
     !defined(_XOPEN_SOURCE) || \  
     ((__STDC_VERSION__ - 0) >= 199901L) || \  
     ((_POSIX_C_SOURCE - 0) >= 200112L) || \      ((_POSIX_C_SOURCE - 0) >= 200112L) || \
     (defined(_XOPEN_SOURCE) && defined(_XOPEN_SOURCE_EXTENDED)) || \      (defined(_XOPEN_SOURCE) && defined(_XOPEN_SOURCE_EXTENDED)) || \
     ((_XOPEN_SOURCE - 0) >= 500) || \      ((_XOPEN_SOURCE - 0) >= 500) || \
     defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)      defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)
   __BEGIN_DECLS
 int      snprintf(char * __restrict, size_t, const char * __restrict, ...)  int      snprintf(char * __restrict, size_t, const char * __restrict, ...)
             __attribute__((__format__(__printf__, 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_)              _BSD_VA_LIST_)
             __attribute__((__format__(__printf__, 3, 0)));                  __printflike(3, 0);
   __END_DECLS
 #endif  #endif
   
 /*  /*
Line 360  __END_DECLS
Line 376  __END_DECLS
 #endif /* _XOPEN_SOURCE >= 500 || _LARGEFILE_SOURCE || _NETBSD_SOURCE */  #endif /* _XOPEN_SOURCE >= 500 || _LARGEFILE_SOURCE || _NETBSD_SOURCE */
   
 /*  /*
    * Functions defined in ISO C99.  Still put under _NETBSD_SOURCE due to
    * backward compatible.
    */
   #if defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)
   __BEGIN_DECLS
   int      vscanf(const char * __restrict, _BSD_VA_LIST_)
                   __scanflike(1, 0);
   int      vfscanf(FILE * __restrict, const char * __restrict, _BSD_VA_LIST_)
                   __scanflike(2, 0);
   int      vsscanf(const char * __restrict, const char * __restrict,
       _BSD_VA_LIST_)
       __scanflike(2, 0);
   __END_DECLS
   #endif /* _ISOC99_SOURCE || _NETBSD_SOURCE */
   
   /*
  * Routines that are purely local.   * Routines that are purely local.
  */   */
 #if defined(_NETBSD_SOURCE)  #if defined(_NETBSD_SOURCE)
Line 372  __END_DECLS
Line 404  __END_DECLS
   
 __BEGIN_DECLS  __BEGIN_DECLS
 int      asprintf(char ** __restrict, const char * __restrict, ...)  int      asprintf(char ** __restrict, const char * __restrict, ...)
             __attribute__((__format__(__printf__, 2, 3)));                  __printflike(2, 3);
 char    *fgetln(FILE * __restrict, size_t * __restrict);  char    *fgetln(FILE * __restrict, size_t * __restrict);
 char    *fparseln(FILE *, size_t *, size_t *, const char[3], int);  char    *fparseln(FILE *, size_t *, size_t *, const char[3], int);
 int      fpurge(FILE *);  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_)      _BSD_VA_LIST_)
             __attribute__((__format__(__printf__, 2, 0)));                  __printflike(2, 0);
 int      vscanf(const char * __restrict, _BSD_VA_LIST_)  
             __attribute__((__format__(__scanf__, 1, 0)));  
 int      vfscanf(FILE * __restrict, const char * __restrict,  
             _BSD_VA_LIST_)  
             __attribute__((__format__(__scanf__, 2, 0)));  
 int      vsscanf(const char * __restrict, const char * __restrict,  
             _BSD_VA_LIST_)  
             __attribute__((__format__(__scanf__, 2, 0)));  
 const char *fmtcheck(const char *, const char *)  const char *fmtcheck(const char *, const char *)
             __attribute__((__format_arg__(2)));                  __format_arg(2);
 __END_DECLS  __END_DECLS
   
 /*  /*
Line 421  __END_DECLS
Line 445  __END_DECLS
  */   */
 #define __sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))  #define __sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
 #if defined(__GNUC__) && defined(__STDC__)  #if defined(__GNUC__) && defined(__STDC__)
 static 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'))          if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
                 return (*_p->_p++ = _c);                  return (*_p->_p++ = _c);
         else          else
Line 444  static inline int __sputc(int _c, FILE *
Line 468  static inline int __sputc(int _c, FILE *
 #define __sfeof(p)      (((p)->_flags & __SEOF) != 0)  #define __sfeof(p)      (((p)->_flags & __SEOF) != 0)
 #define __sferror(p)    (((p)->_flags & __SERR) != 0)  #define __sferror(p)    (((p)->_flags & __SERR) != 0)
 #define __sclearerr(p)  ((void)((p)->_flags &= ~(__SERR|__SEOF)))  #define __sclearerr(p)  ((void)((p)->_flags &= ~(__SERR|__SEOF)))
 #define __sfileno(p)    ((p)->_file)  #define __sfileno(p)    \
       ((p)->_file == -1 ? -1 : (int)(unsigned short)(p)->_file)
   
 #ifndef __lint__  #ifndef __lint__
 #if !defined(_REENTRANT) && !defined(_PTHREADS)  #if !defined(_REENTRANT) && !defined(_PTHREADS)
Line 476  static inline int __sputc(int _c, FILE *
Line 501  static inline int __sputc(int _c, FILE *
 #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 _FORTIFY_SOURCE > 0
   #include <ssp/stdio.h>
   #endif
   
 #endif /* _STDIO_H_ */  #endif /* _STDIO_H_ */

Legend:
Removed from v.1.62  
changed lines
  Added in v.1.75.2.1

CVSweb <webmaster@jp.NetBSD.org>