Browse Source

remove redundant __noreturn__ attributes now that __dead is sane for modern gcc

OPENBSD_3_0
millert 23 years ago
parent
commit
bb68e62e46
2 changed files with 11 additions and 11 deletions
  1. +9
    -9
      src/include/err.h
  2. +2
    -2
      src/include/unistd.h

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

@ -1,4 +1,4 @@
/* $OpenBSD: err.h,v 1.6 2001/07/19 15:06:22 espie Exp $ */
/* $OpenBSD: err.h,v 1.7 2001/08/07 21:34:42 millert Exp $ */
/* $NetBSD: err.h,v 1.11 1994/10/26 00:55:52 cgd Exp $ */
/*-
@ -52,13 +52,13 @@
__BEGIN_DECLS
__dead void err __P((int, const char *, ...))
__attribute__((__noreturn__, __format__ (printf, 2, 3)));
__attribute__((__format__ (printf, 2, 3)));
__dead void verr __P((int, const char *, _BSD_VA_LIST_))
__attribute__((__noreturn__, __format__ (printf, 2, 0)));
__attribute__((__format__ (printf, 2, 0)));
__dead void errx __P((int, const char *, ...))
__attribute__((__noreturn__, __format__ (printf, 2, 3)));
__attribute__((__format__ (printf, 2, 3)));
__dead void verrx __P((int, const char *, _BSD_VA_LIST_))
__attribute__((__noreturn__, __format__ (printf, 2, 0)));
__attribute__((__format__ (printf, 2, 0)));
void warn __P((const char *, ...))
__attribute__((__format__ (printf, 1, 2)));
void vwarn __P((const char *, _BSD_VA_LIST_))
@ -73,13 +73,13 @@ void vwarnx __P((const char *, _BSD_VA_LIST_))
* versions of err*,warn* do not get used.
*/
__dead void _err __P((int, const char *, ...))
__attribute__((__noreturn__, __format__ (printf, 2, 3)));
__attribute__((__format__ (printf, 2, 3)));
__dead void _verr __P((int, const char *, _BSD_VA_LIST_))
__attribute__((__noreturn__, __format__ (printf, 2, 0)));
__attribute__((__format__ (printf, 2, 0)));
__dead void _errx __P((int, const char *, ...))
__attribute__((__noreturn__, __format__ (printf, 2, 3)));
__attribute__((__format__ (printf, 2, 3)));
__dead void _verrx __P((int, const char *, _BSD_VA_LIST_))
__attribute__((__noreturn__, __format__ (printf, 2, 0)));
__attribute__((__format__ (printf, 2, 0)));
void _warn __P((const char *, ...))
__attribute__((__format__ (printf, 1, 2)));
void _vwarn __P((const char *, _BSD_VA_LIST_))


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

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


Loading…
Cancel
Save