diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2015-08-31 02:53:58 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2015-08-31 02:53:58 +0000 |
| commit | a4c7e44b581895df2d4b7cc4f88e39b12a83c740 (patch) | |
| tree | 0990e8c4dea4839a061c02403f3b3bb05884c4de /include | |
| parent | 105db1ed9f850ad922a57ad78b72b1919c986e21 (diff) | |
Add framework for resolving (pun intended) libc namespace issues, using
wrapper .h files and asm labels to let internal calls resolve directly and
not be overridable or use the PLT. Then, apply that framework to most of
the functions in stdio.h, string.h, err.h, and wchar.h. Delete the
should-have-been-hidden-all-along _v?(err|warn)[cx]? symbols while here.
tests clean on i386, amd64, sparc64, powerpc, and mips64
naming feedback from kettenis@ and millert@
ok kettenis@
Diffstat (limited to 'include')
| -rw-r--r-- | include/err.h | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/include/err.h b/include/err.h index af9736851ec..3fed1b533e8 100644 --- a/include/err.h +++ b/include/err.h @@ -1,4 +1,4 @@ -/* $OpenBSD: err.h,v 1.12 2014/04/22 00:33:02 guenther Exp $ */ +/* $OpenBSD: err.h,v 1.13 2015/08/31 02:53:56 guenther Exp $ */ /* $NetBSD: err.h,v 1.11 1994/10/26 00:55:52 cgd Exp $ */ /*- @@ -65,34 +65,6 @@ void warnx(const char *, ...) void vwarnx(const char *, __va_list) __attribute__((__format__ (printf, 1, 0))); -/* - * The _* versions are for use inside libc only and will go away - */ -__dead void _err(int, const char *, ...) - __attribute__((__format__ (printf, 2, 3))); -__dead void _verr(int, const char *, __va_list) - __attribute__((__format__ (printf, 2, 0))); -__dead void _errc(int, int, const char *, ...) - __attribute__((__format__ (printf, 3, 4))); -__dead void _verrc(int, int, const char *, __va_list) - __attribute__((__format__ (printf, 3, 0))); -__dead void _errx(int, const char *, ...) - __attribute__((__format__ (printf, 2, 3))); -__dead void _verrx(int, const char *, __va_list) - __attribute__((__format__ (printf, 2, 0))); -void _warn(const char *, ...) - __attribute__((__format__ (printf, 1, 2))); -void _vwarn(const char *, __va_list) - __attribute__((__format__ (printf, 1, 0))); -void _warnc(int, const char *, ...) - __attribute__((__format__ (printf, 2, 3))); -void _vwarnc(int, const char *, __va_list) - __attribute__((__format__ (printf, 2, 0))); -void _warnx(const char *, ...) - __attribute__((__format__ (printf, 1, 2))); -void _vwarnx(const char *, __va_list) - __attribute__((__format__ (printf, 1, 0))); - __END_DECLS #endif /* !_ERR_H_ */ |