[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.79.2.1 and 1.91

version 1.79.2.1, 2012/04/17 00:05:11 version 1.91, 2014/08/07 17:24:03
Line 146  typedef struct __sFILE {
Line 146  typedef struct __sFILE {
 } 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 228  int  fflush(FILE *);
Line 228  int  fflush(FILE *);
 int      fgetc(FILE *);  int      fgetc(FILE *);
 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 242  long  ftell(FILE *);
Line 242  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);                  __printflike(1, 2);
Line 461  __END_DECLS
Line 458  __END_DECLS
 #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++ = (unsigned char)_c;
         else          else
                 return (__swbuf(_c, _p));                  return __swbuf(_c, _p);
 }  }
 #else  #else
 /*  /*
Line 485  static __inline int __sputc(int _c, FILE
Line 482  static __inline int __sputc(int _c, FILE
 #define __sfileno(p)    \  #define __sfileno(p)    \
     ((p)->_file == -1 ? -1 : (int)(unsigned short)(p)->_file)      ((p)->_file == -1 ? -1 : (int)(unsigned short)(p)->_file)
   
 #ifndef __lint__  #if !defined(__lint__) && !defined(__cplusplus)
 #if !defined(_REENTRANT) && !defined(_PTHREADS)  #if !defined(_REENTRANT) && !defined(_PTHREADS)
 #define feof(p)         __sfeof(p)  #define feof(p)         __sfeof(p)
 #define ferror(p)       __sferror(p)  #define ferror(p)       __sferror(p)
Line 494  static __inline int __sputc(int _c, FILE
Line 491  static __inline int __sputc(int _c, FILE
 #define getc(fp)        __sgetc(fp)  #define getc(fp)        __sgetc(fp)
 #define putc(x, fp)     __sputc(x, fp)  #define putc(x, fp)     __sputc(x, fp)
 #endif /* !_REENTRANT && !_PTHREADS */  #endif /* !_REENTRANT && !_PTHREADS */
 #endif /* __lint__ */  
   
 #define getchar()       getc(stdin)  #define getchar()       getc(stdin)
 #define putchar(x)      putc(x, stdout)  #define putchar(x)      putc(x, stdout)
   
 #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \  #endif /* !__lint__ && !__cplusplus */
     defined(_NETBSD_SOURCE)  
   #if (defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
       defined(_NETBSD_SOURCE)) && !defined(__cplusplus)
 #if !defined(_REENTRANT) && !defined(_PTHREADS)  #if !defined(_REENTRANT) && !defined(_PTHREADS)
 #define fileno(p)       __sfileno(p)  #define fileno(p)       __sfileno(p)
 #endif /* !_REENTRANT && !_PTHREADS */  #endif /* !_REENTRANT && !_PTHREADS */
 #endif /* !_ANSI_SOURCE */  #endif /* !_ANSI_SOURCE && !__cplusplus*/
   
 #if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)  #if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)
   __BEGIN_DECLS
 int      vdprintf(int, const char * __restrict, __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);
   __END_DECLS
 #endif /* (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE) */  #endif /* (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE) */
   
 #if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \  #if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \
     defined(_REENTRANT) || defined(_NETBSD_SOURCE)      defined(_REENTRANT) || defined(_NETBSD_SOURCE) && !defined(__cplusplus)
 #define getc_unlocked(fp)       __sgetc(fp)  #define getc_unlocked(fp)       __sgetc(fp)
 #define putc_unlocked(x, fp)    __sputc(x, fp)  #define putc_unlocked(x, fp)    __sputc(x, fp)
   
Line 524  int  dprintf(int, const char * __restric
Line 524  int  dprintf(int, const char * __restric
   
 #if (_POSIX_C_SOURCE - 0) >= 200809L || (_XOPEN_SOURCE - 0) >= 700 || \  #if (_POSIX_C_SOURCE - 0) >= 200809L || (_XOPEN_SOURCE - 0) >= 700 || \
     defined(_NETBSD_SOURCE)      defined(_NETBSD_SOURCE)
   __BEGIN_DECLS
 FILE *fmemopen(void * __restrict, size_t, const char * __restrict);  FILE *fmemopen(void * __restrict, size_t, const char * __restrict);
   ssize_t  getdelim(char ** __restrict, size_t * __restrict, int,
               FILE * __restrict);
   ssize_t  getline(char ** __restrict, size_t * __restrict, FILE * __restrict);
   __END_DECLS
   #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);
   #ifdef _NETBSD_SOURCE
   int     snprintf_ss(char *restrict, size_t, const char * __restrict, ...)
       __printflike(3, 4);
   int     vsnprintf_ss(char *restrict, size_t, const char * __restrict, __va_list)
       __printflike(3, 0);
   #endif
   __END_DECLS
 #endif  #endif
   
 #if _FORTIFY_SOURCE > 0  #if _FORTIFY_SOURCE > 0

Legend:
Removed from v.1.79.2.1  
changed lines
  Added in v.1.91

CVSweb <webmaster@jp.NetBSD.org>