[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.20 and 1.34

version 1.20, 1998/02/02 21:07:52 version 1.34, 2000/07/08 13:46:33
Line 41 
Line 41 
 #ifndef _STDIO_H_  #ifndef _STDIO_H_
 #define _STDIO_H_  #define _STDIO_H_
   
 #if !defined(_ANSI_SOURCE) && !defined(__STRICT_ANSI__)  #include <sys/ansi.h>
 #include <sys/types.h>  
 #endif  
   
 #include <sys/cdefs.h>  #include <sys/cdefs.h>
   #include <sys/featuretest.h>
   
 #include <machine/ansi.h>  #include <machine/ansi.h>
 #ifdef  _BSD_SIZE_T_  #ifdef  _BSD_SIZE_T_
Line 53  typedef _BSD_SIZE_T_ size_t;
Line 52  typedef _BSD_SIZE_T_ size_t;
 #undef  _BSD_SIZE_T_  #undef  _BSD_SIZE_T_
 #endif  #endif
   
 #ifndef NULL  #include <sys/null.h>
 #define NULL    0  
 #endif  
   
 /*  /*
  * This is fairly grotesque, but pure ANSI code must not inspect the   * This is fairly grotesque, but pure ANSI code must not inspect the
Line 63  typedef _BSD_SIZE_T_ size_t;
Line 60  typedef _BSD_SIZE_T_ size_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__)  #if !defined(_ANSI_SOURCE) && !defined(__STRICT_ANSI__)
 typedef off_t fpos_t;  typedef __off_t fpos_t;
 #else  #else
 typedef struct __sfpos {  typedef struct __sfpos {
         long long _pos;                 /* XXX must be the same as off_t */          __off_t _pos;
 } fpos_t;  } fpos_t;
 #endif  #endif
   
Line 162  __END_DECLS
Line 159  __END_DECLS
 #define __SNPT  0x0800          /* do not do fseek() optimisation */  #define __SNPT  0x0800          /* do not do fseek() optimisation */
 #define __SOFF  0x1000          /* set iff _offset is in fact correct */  #define __SOFF  0x1000          /* set iff _offset is in fact correct */
 #define __SMOD  0x2000          /* true => fgetln modified _p text */  #define __SMOD  0x2000          /* true => fgetln modified _p text */
   #define __SALC  0x4000          /* allocate string space dynamically */
   
 /*  /*
  * The following three definitions are for ANSI C, which took them   * The following three definitions are for ANSI C, which took them
Line 195  __END_DECLS
Line 193  __END_DECLS
 #define L_tmpnam        1024    /* XXX must be == PATH_MAX */  #define L_tmpnam        1024    /* XXX must be == PATH_MAX */
 #define TMP_MAX         308915776  #define TMP_MAX         308915776
   
   /* Always ensure that these are consistent with <fcntl.h> and <unistd.h>! */
 #ifndef SEEK_SET  #ifndef SEEK_SET
 #define SEEK_SET        0       /* set file offset to offset */  #define SEEK_SET        0       /* set file offset to offset */
 #endif  #endif
Line 234  long  ftell __P((FILE *));
Line 233  long  ftell __P((FILE *));
 size_t   fwrite __P((const void *, size_t, size_t, FILE *));  size_t   fwrite __P((const void *, size_t, size_t, FILE *));
 int      getc __P((FILE *));  int      getc __P((FILE *));
 int      getchar __P((void));  int      getchar __P((void));
 char    *gets __P((char *));  
 void     perror __P((const char *));  void     perror __P((const char *));
 int      printf __P((const char *, ...));  int      printf __P((const char *, ...));
 int      putc __P((int, FILE *));  int      putc __P((int, FILE *));
 int      putchar __P((int));  int      putchar __P((int));
 int      puts __P((const char *));  int      puts __P((const char *));
 int      remove __P((const char *));  int      remove __P((const char *));
 int      rename  __P((const char *, const char *));  
 void     rewind __P((FILE *));  void     rewind __P((FILE *));
 int      scanf __P((const char *, ...));  int      scanf __P((const char *, ...));
 void     setbuf __P((FILE *, char *));  void     setbuf __P((FILE *, char *));
 int      setvbuf __P((FILE *, char *, int, size_t));  int      setvbuf __P((FILE *, char *, int, size_t));
 int      sprintf __P((char *, const char *, ...));  
 int      sscanf __P((const char *, const char *, ...));  int      sscanf __P((const char *, const char *, ...));
 FILE    *tmpfile __P((void));  FILE    *tmpfile __P((void));
 char    *tmpnam __P((char *));  
 int      ungetc __P((int, FILE *));  int      ungetc __P((int, FILE *));
 int      vfprintf __P((FILE *, const char *, _BSD_VA_LIST_));  int      vfprintf __P((FILE *, const char *, _BSD_VA_LIST_));
 int      vprintf __P((const char *, _BSD_VA_LIST_));  int      vprintf __P((const char *, _BSD_VA_LIST_));
   
   #ifndef __AUDIT__
   char    *gets __P((char *));
   int      sprintf __P((char *, const char *, ...));
   char    *tmpnam __P((char *));
 int      vsprintf __P((char *, const char *, _BSD_VA_LIST_));  int      vsprintf __P((char *, const char *, _BSD_VA_LIST_));
   #endif
   
   #if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE)
   int      rename  __P((const char *, const char *)) __RENAME(__posix_rename);
   #else
   int      rename  __P((const char *, const char *));
   #endif
 __END_DECLS  __END_DECLS
   
 /*  /*
  * Functions defined in POSIX 1003.1.   * IEEE Std 1003.1-90
  */   */
 #ifndef _ANSI_SOURCE  #ifndef _ANSI_SOURCE
 #define L_ctermid       1024    /* size for ctermid(); PATH_MAX */  #define L_ctermid       1024    /* size for ctermid(); PATH_MAX */
Line 271  int  fileno __P((FILE *));
Line 278  int  fileno __P((FILE *));
 __END_DECLS  __END_DECLS
 #endif /* not ANSI */  #endif /* not ANSI */
   
 #if 1   /* _POSIX_C_SOURCE >= 199506L */  /*
 extern void     flockfile __P((FILE *));   * IEEE Std 1003.1c-95, also adopted by X/Open CAE Spec Issue 5 Version 2
 extern int      ftrylockfile __P((FILE *));   */
 extern void     funlockfile __P((FILE *));  #if (!defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
 extern int      getc_unlocked __P((FILE *));       !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE - 0) >= 199506L || \
 extern int      getchar_unlocked __P((void));      (_XOPEN_SOURCE - 0) >= 500 || defined(_REENTRANT)
 extern int      putc_unlocked __P((int, FILE *));  __BEGIN_DECLS
 extern int      putchar_unlocked __P((int));  #if 0 /* not yet */
   void    flockfile __P((FILE *));
   int     ftrylockfile __P((FILE *));
   void    funlockfile __P((FILE *));
   #endif /* 0 */
   int     getc_unlocked __P((FILE *));
   int     getchar_unlocked __P((void));
   int     putc_unlocked __P((int, FILE *));
   int     putchar_unlocked __P((int));
   __END_DECLS
   #endif /* (!_ANSI_SOURCE && !_POSIX_C_SOURCE && !_XOPEN_SOURCE) || ... */
   
   /*
    * Functions defined in POSIX 1003.2 and XPG2 or later.
    */
   #if (!defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
        !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE - 0) >= 2 || \
       (_XOPEN_SOURCE - 0) >= 2
   __BEGIN_DECLS
   int      pclose __P((FILE *));
   FILE    *popen __P((const char *, const char *));
   __END_DECLS
 #endif  #endif
   
 /*  /*
    * Functions defined in XPG4.2.
    */
   #if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) || \
       defined(_XOPEN_SOURCE)
   __BEGIN_DECLS
   int      getw __P((FILE *));
   int      putw __P((int, FILE *));
   int      snprintf __P((char *, size_t, const char *, ...))
               __attribute__((__format__(__printf__, 3, 4)));
   int      vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_))
               __attribute__((__format__(__printf__, 3, 0)));
   
   #ifndef __AUDIT__
   char    *tempnam __P((const char *, const char *));
   #endif
   __END_DECLS
   #endif
   
   /*
    * X/Open CAE Specification Issue 5 Version 2
    */
   #if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \
       (_XOPEN_SOURCE - 0) >= 500 || defined(_LARGEFILE_SOURCE)
   #ifndef off_t
   typedef __off_t         off_t;
   #define off_t           off_t
   #endif 7* off_t */
   
   int      fseeko __P((FILE *, off_t, int));
   off_t    ftello __P((FILE *));
   #endif /* (!_POSIX_SOURCE && !_XOPEN_SOURCE) || ... */
   
   /*
  * Routines that are purely local.   * Routines that are purely local.
  */   */
 #if !defined (_ANSI_SOURCE) && !defined(_POSIX_SOURCE)  #if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
       !defined(_XOPEN_SOURCE)
 __BEGIN_DECLS  __BEGIN_DECLS
   int      asprintf __P((char **, const char *, ...))
                   __attribute__((__format__(__printf__, 2, 3)));
 char    *fgetln __P((FILE *, size_t *));  char    *fgetln __P((FILE *, size_t *));
 int      fpurge __P((FILE *));  int      fpurge __P((FILE *));
 int      getw __P((FILE *));  
 int      pclose __P((FILE *));  
 FILE    *popen __P((const char *, const char *));  
 int      putw __P((int, FILE *));  
 void     setbuffer __P((FILE *, char *, int));  void     setbuffer __P((FILE *, char *, int));
 int      setlinebuf __P((FILE *));  int      setlinebuf __P((FILE *));
 char    *tempnam __P((const char *, const char *));  int      vasprintf __P((char **, const char *, _BSD_VA_LIST_))
 int      snprintf __P((char *, size_t, const char *, ...))                  __attribute__((__format__(__printf__, 2, 0)));
                 __attribute__((format (printf, 3, 4)));  
 int      vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_))  
                 __attribute__((format (printf, 3, 0)));  
 int      vscanf __P((const char *, _BSD_VA_LIST_))  int      vscanf __P((const char *, _BSD_VA_LIST_))
                 __attribute__((format (scanf, 1, 0)));              __attribute__((__format__(__scanf__, 1, 0)));
 int      vsscanf __P((const char *, const char *, _BSD_VA_LIST_))  int      vsscanf __P((const char *, const char *, _BSD_VA_LIST_))
                 __attribute__((format (scanf, 2, 0)));              __attribute__((__format__(__scanf__, 2, 0)));
 __END_DECLS  __END_DECLS
   
 /*  /*
Line 374  static __inline int __sputc(int _c, FILE
Line 431  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 */  #endif /* !_REENTRANT */
 #endif /* lint */  #endif /* lint */
   
 #define getchar()       getc(stdin)  #define getchar()       getc(stdin)
 #define putchar(x)      putc(x, stdout)  #define putchar(x)      putc(x, stdout)
   
 #ifndef _ANSI_SOURCE  #ifndef _ANSI_SOURCE
   #ifndef _REENTRANT
 #define fileno(p)       __sfileno(p)  #define fileno(p)       __sfileno(p)
   #endif /* !_REENTRANT */
   #endif /* !_ANSI_SOURCE */
   
   #if (!defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
        !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE - 0) >= 199506L || \
       (_XOPEN_SOURCE - 0) >= 500 || defined(_REENTRANT)
 #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)
   
 #define getchar_unlocked()      getc_unlocked(stdin)  #define getchar_unlocked()      getc_unlocked(stdin)
 #define putchar_unlocked(x)     putc_unlocked(x, stdout)  #define putchar_unlocked(x)     putc_unlocked(x, stdout)
 #endif /* _ANSI_SOURCE */  #endif /* (!_ANSI_SOURCE && !_POSIX_C_SOURCE && !_XOPEN_SOURCE) || ... */
   
 #endif /* _STDIO_H_ */  #endif /* _STDIO_H_ */

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.34

CVSweb <webmaster@jp.NetBSD.org>