Browse Source

use __x__ formats for __attribute__ arguments; guenther@gac.edu

OPENBSD_2_9
deraadt 24 years ago
parent
commit
fb625bc33f
3 changed files with 26 additions and 26 deletions
  1. +17
    -17
      src/include/err.h
  2. +7
    -7
      src/include/stdio.h
  3. +2
    -2
      src/include/unistd.h

+ 17
- 17
src/include/err.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: err.h,v 1.3 1997/09/21 10:45:32 niklas Exp $ */
/* $OpenBSD: err.h,v 1.4 2000/12/06 17:18:42 deraadt Exp $ */
/* $NetBSD: err.h,v 1.11 1994/10/26 00:55:52 cgd Exp $ */ /* $NetBSD: err.h,v 1.11 1994/10/26 00:55:52 cgd Exp $ */
/*- /*-
@ -52,21 +52,21 @@
__BEGIN_DECLS __BEGIN_DECLS
__dead void err __P((int, const char *, ...)) __dead void err __P((int, const char *, ...))
__attribute__((noreturn, format (printf, 2, 3)));
__attribute__((__noreturn__, __format__ (printf, 2, 3)));
__dead void verr __P((int, const char *, _BSD_VA_LIST_)) __dead void verr __P((int, const char *, _BSD_VA_LIST_))
__attribute__((noreturn, format (printf, 2, 0)));
__attribute__((__noreturn__, __format__ (printf, 2, 0)));
__dead void errx __P((int, const char *, ...)) __dead void errx __P((int, const char *, ...))
__attribute__((noreturn, format (printf, 2, 3)));
__attribute__((__noreturn__, __format__ (printf, 2, 3)));
__dead void verrx __P((int, const char *, _BSD_VA_LIST_)) __dead void verrx __P((int, const char *, _BSD_VA_LIST_))
__attribute__((noreturn, format (printf, 2, 0)));
__attribute__((__noreturn__, __format__ (printf, 2, 0)));
void warn __P((const char *, ...)) void warn __P((const char *, ...))
__attribute__((format (printf, 1, 2)));
__attribute__((__format__ (printf, 1, 2)));
void vwarn __P((const char *, _BSD_VA_LIST_)) void vwarn __P((const char *, _BSD_VA_LIST_))
__attribute__((format (printf, 1, 0)));
__attribute__((__format__ (printf, 1, 0)));
void warnx __P((const char *, ...)) void warnx __P((const char *, ...))
__attribute__((format (printf, 1, 2)));
__attribute__((__format__ (printf, 1, 2)));
void vwarnx __P((const char *, _BSD_VA_LIST_)) void vwarnx __P((const char *, _BSD_VA_LIST_))
__attribute__((format (printf, 1, 0)));
__attribute__((__format__ (printf, 1, 0)));
#ifdef __indr_reference #ifdef __indr_reference
/* /*
@ -74,21 +74,21 @@ void vwarnx __P((const char *, _BSD_VA_LIST_))
* versions of err*,warn* do not get used. * versions of err*,warn* do not get used.
*/ */
__dead void _err __P((int, const char *, ...)) __dead void _err __P((int, const char *, ...))
__attribute__((noreturn, format (printf, 2, 3)));
__attribute__((__noreturn__, __format__ (printf, 2, 3)));
__dead void _verr __P((int, const char *, _BSD_VA_LIST_)) __dead void _verr __P((int, const char *, _BSD_VA_LIST_))
__attribute__((noreturn, format (printf, 2, 0)));
__attribute__((__noreturn__, __format__ (printf, 2, 0)));
__dead void _errx __P((int, const char *, ...)) __dead void _errx __P((int, const char *, ...))
__attribute__((noreturn, format (printf, 2, 3)));
__attribute__((__noreturn__, __format__ (printf, 2, 3)));
__dead void _verrx __P((int, const char *, _BSD_VA_LIST_)) __dead void _verrx __P((int, const char *, _BSD_VA_LIST_))
__attribute__((noreturn, format (printf, 2, 0)));
__attribute__((__noreturn__, __format__ (printf, 2, 0)));
void _warn __P((const char *, ...)) void _warn __P((const char *, ...))
__attribute__((format (printf, 1, 2)));
__attribute__((__format__ (printf, 1, 2)));
void _vwarn __P((const char *, _BSD_VA_LIST_)) void _vwarn __P((const char *, _BSD_VA_LIST_))
__attribute__((format (printf, 1, 0)));
__attribute__((__format__ (printf, 1, 0)));
void _warnx __P((const char *, ...)) void _warnx __P((const char *, ...))
__attribute__((format (printf, 1, 2)));
__attribute__((__format__ (printf, 1, 2)));
void _vwarnx __P((const char *, _BSD_VA_LIST_)) void _vwarnx __P((const char *, _BSD_VA_LIST_))
__attribute__((format (printf, 1, 0)));
__attribute__((__format__ (printf, 1, 0)));
#endif #endif
__END_DECLS __END_DECLS


+ 7
- 7
src/include/stdio.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: stdio.h,v 1.14 2000/03/04 17:16:02 millert Exp $ */
/* $OpenBSD: stdio.h,v 1.15 2000/12/06 17:18:42 deraadt Exp $ */
/* $NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $ */ /* $NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $ */
/*- /*-
@ -303,7 +303,7 @@ __END_DECLS
#if !defined (_ANSI_SOURCE) && !defined(_POSIX_SOURCE) #if !defined (_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
__BEGIN_DECLS __BEGIN_DECLS
int asprintf __P((char **, const char *, ...)) int asprintf __P((char **, const char *, ...))
__attribute__((format (printf, 2, 3)));
__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 getw __P((FILE *));
@ -314,15 +314,15 @@ void setbuffer __P((FILE *, char *, int));
int setlinebuf __P((FILE *)); int setlinebuf __P((FILE *));
char *tempnam __P((const char *, const char *)); char *tempnam __P((const char *, const char *));
int snprintf __P((char *, size_t, const char *, ...)) int snprintf __P((char *, size_t, const char *, ...))
__attribute__((format (printf, 3, 4)));
__attribute__((__format__ (printf, 3, 4)));
int vasprintf __P((char **, const char *, _BSD_VA_LIST_)) int vasprintf __P((char **, const char *, _BSD_VA_LIST_))
__attribute__((format (printf, 2, 0)));
__attribute__((__format__ (printf, 2, 0)));
int vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_)) int vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_))
__attribute__((format (printf, 3, 0)));
__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
/* /*


+ 2
- 2
src/include/unistd.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: unistd.h,v 1.33 2000/09/12 17:30:45 millert Exp $ */
/* $OpenBSD: unistd.h,v 1.34 2000/12/06 17:18:43 deraadt Exp $ */
/* $NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $ */ /* $NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $ */
/*- /*-
@ -56,7 +56,7 @@
#endif #endif
__BEGIN_DECLS __BEGIN_DECLS
__dead void _exit __P((int)) __attribute__((noreturn));
__dead void _exit __P((int)) __attribute__((__noreturn__));
int access __P((const char *, int)); int access __P((const char *, int));
unsigned int alarm __P((unsigned int)); unsigned int alarm __P((unsigned int));
int chdir __P((const char *)); int chdir __P((const char *));


Loading…
Cancel
Save