diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2022-04-21 14:49:22 +0000 |
|---|---|---|
| committer | Zhenlei Huang <zlei@FreeBSD.org> | 2023-02-26 05:26:17 +0000 |
| commit | fcacb96b345a16c4619686ab388e6b77fb715828 (patch) | |
| tree | edcc3d69fb92ce7e4ae6ee55a98cade4116b6a6a | |
| parent | 96200385228ea9c749e455dae50cca1d42818325 (diff) | |
| download | src-fcacb96b345a16c4619686ab388e6b77fb715828.tar.gz src-fcacb96b345a16c4619686ab388e6b77fb715828.zip | |
ctfdump: Remove definitions of warn() and vwarn()
The presence of the latter causes a link error when building a
statically linked ctfdump(1) because libc defines the same symbol.
libc's warn() is defined as a weak symbol and so does not cause the same
problem, but let's just use libc's version.
Reported by: stephane rochoy <stephane.rochoy@stormshield.eu>
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 45dd2eaac379e5576f745380260470204c49beac)
(cherry picked from commit 5def1805d144f3e95dac966d72a6fc3878ce6b98)
| -rw-r--r-- | cddl/contrib/opensolaris/tools/ctf/common/utils.c | 28 | ||||
| -rw-r--r-- | cddl/contrib/opensolaris/tools/ctf/common/utils.h | 2 | ||||
| -rw-r--r-- | cddl/contrib/opensolaris/tools/ctf/dump/dump.c | 3 |
3 files changed, 2 insertions, 31 deletions
diff --git a/cddl/contrib/opensolaris/tools/ctf/common/utils.c b/cddl/contrib/opensolaris/tools/ctf/common/utils.c index 38509ec36343..fda29486d94b 100644 --- a/cddl/contrib/opensolaris/tools/ctf/common/utils.c +++ b/cddl/contrib/opensolaris/tools/ctf/common/utils.c @@ -24,8 +24,7 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - +#include <err.h> #include <string.h> #include <stdlib.h> #include <stdarg.h> @@ -37,31 +36,6 @@ /*LINTLIBRARY*/ void -vwarn(const char *format, va_list alist) -{ - int err = errno; - - if (pname != NULL) - (void) fprintf(stderr, "%s: ", pname); - - (void) vfprintf(stderr, format, alist); - - if (strchr(format, '\n') == NULL) - (void) fprintf(stderr, ": %s\n", strerror(err)); -} - -/*PRINTFLIKE1*/ -void -warn(const char *format, ...) -{ - va_list alist; - - va_start(alist, format); - vwarn(format, alist); - va_end(alist); -} - -void vdie(const char *format, va_list alist) { vwarn(format, alist); diff --git a/cddl/contrib/opensolaris/tools/ctf/common/utils.h b/cddl/contrib/opensolaris/tools/ctf/common/utils.h index 9b07361a53ab..99378bb4f251 100644 --- a/cddl/contrib/opensolaris/tools/ctf/common/utils.h +++ b/cddl/contrib/opensolaris/tools/ctf/common/utils.h @@ -39,8 +39,6 @@ extern "C" { #define E_ERROR 1 /* Exit status for error */ #define E_USAGE 2 /* Exit status for usage error */ -extern void vwarn(const char *, va_list); -extern void warn(const char *, ...); extern void vdie(const char *, va_list); extern void die(const char *, ...); diff --git a/cddl/contrib/opensolaris/tools/ctf/dump/dump.c b/cddl/contrib/opensolaris/tools/ctf/dump/dump.c index f3e8120192da..a4a954d97453 100644 --- a/cddl/contrib/opensolaris/tools/ctf/dump/dump.c +++ b/cddl/contrib/opensolaris/tools/ctf/dump/dump.c @@ -24,13 +24,12 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/sysmacros.h> #include <sys/stat.h> #include <sys/mman.h> +#include <err.h> #include <strings.h> #include <unistd.h> #include <stdlib.h> |