From 9b9d2a55a62c8e82206c25f94fcc7f4e2765250e Mon Sep 17 00:00:00 2001 From: guenther Date: Mon, 31 Aug 2015 02:53:56 +0000 Subject: 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@ --- lib/libc/gen/err.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'lib/libc/gen/err.c') diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c index e7ec29de4fb..15e1b97c417 100644 --- a/lib/libc/gen/err.c +++ b/lib/libc/gen/err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: err.c,v 1.11 2012/12/05 23:19:59 deraadt Exp $ */ +/* $OpenBSD: err.c,v 1.12 2015/08/31 02:53:57 guenther Exp $ */ /*- * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. @@ -31,17 +31,13 @@ #include #include -/* PRINTFLIKE2 */ __dead void -_err(int eval, const char *fmt, ...) +err(int eval, const char *fmt, ...) { va_list ap; va_start(ap, fmt); - _verr(eval, fmt, ap); + verr(eval, fmt, ap); va_end(ap); } - -/* PRINTFLIKE2 */ -__weak_alias(err, _err); - +DEF_WEAK(err); -- cgit v1.2.3-59-g8ed1b