From nobody Thu Apr 28 00:34:54 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id ABFED1AB758B; Thu, 28 Apr 2022 00:34:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kpc8H2Csdz4kxp; Thu, 28 Apr 2022 00:34:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651106095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sNfRGQiVuuwKlBZyw8nK5kXDF290KBeyt4nq2BrOfYs=; b=RqNqEfgCVytD7sO8ywarIKI5opYsNOjJ9/vusX01GTcDgrGvKJOwoYq3PIjnVK58Zvw5Pl uR8hyrsgzzc7ixLL7+QgEYoazGCfWMLoiQJzsugU+fTgFFtRXxY48BuUib8P3X1l6TMOOa WV8jRJ1+PXUxgZU2VSGkv5qIgp4bSwIwX9K1QN/v0iOwRvL13zMJStZedUlJAYsdTsrdN/ Yf5X8mjJWp6CGBEtXCgA4jraQ4KKI8yfNEvnoqH7zjdlayPtNAiU4srSuVXfyNVup3E6Dv y90XnSzt8cyhuweCIxKnSX8IuxMkthaY55wI9xGAtZFO/uAuxbNHsRB0LMC/Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0C71164DC; Thu, 28 Apr 2022 00:34:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23S0Ys33066421; Thu, 28 Apr 2022 00:34:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23S0Ys3N066420; Thu, 28 Apr 2022 00:34:54 GMT (envelope-from git) Date: Thu, 28 Apr 2022 00:34:54 GMT Message-Id: <202204280034.23S0Ys3N066420@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5def1805d144 - stable/13 - ctfdump: Remove definitions of warn() and vwarn() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5def1805d144f3e95dac966d72a6fc3878ce6b98 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651106095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sNfRGQiVuuwKlBZyw8nK5kXDF290KBeyt4nq2BrOfYs=; b=rG21lWKeJiB+tJ06xSSowsMst0oc34/9lkL3P2PrwPKqJzNcFK7t3OnqXWqegfOLNqRQh+ 3gJUdKi4RLy2ihNlQpISsbiXtZsrSwRoNAxFX5tNGvuQO8frKTQaPEKaqmL2YqRKwslkzl gd0h0OEdwmlBvZZ9ulc05fWL7SNUfsewHtD+citApCRUV3ILxXtOl+NdBR69HhfTHRCl1B u0WQHV2IScCMfctirqv5SLJWJAeD86QPIK5pacsFC8cW4mRR72XjayZSG9bH6EtlJjJBVs lfAu2A9MBdfIyVI1H48W7Yl0cVdzoqeDBnRFIE2OQxp6xXu6q3McB1dSFB+r/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651106095; a=rsa-sha256; cv=none; b=n80VAatmndLU3tBaOJHKIOIndcF9QwdaJWZpbEPiM4Zdlfmg65s2IApAfOl66TpVeu06g9 AxWUHLMBR3sS6s6YmpMobi9nvin8ulKenlVNBRHA7h0EAnrnnKH8flWKUFb+utyEnGPhwt F6rxr1y6Gfj/mIo6AbeuyIZ17ecA38hZOB0ee5o/yMe1qSvGA4fmT2D5RoEfIu2uCcc6hr yAcFp/RJiCJ2Oclw0XdlSrVR1jFioMDYfkQJOtDnwRxLtoTcpUZksUOAQ2iVWcJpA9LRTj 5wRIBB2Orm9GVAeWn9FYpmbxODZJm5cLc3s2m8XP6gPaMrso/4217gaetzeCzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5def1805d144f3e95dac966d72a6fc3878ce6b98 commit 5def1805d144f3e95dac966d72a6fc3878ce6b98 Author: Mark Johnston AuthorDate: 2022-04-21 14:49:22 +0000 Commit: Mark Johnston CommitDate: 2022-04-28 00:34:39 +0000 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 Sponsored by: The FreeBSD Foundation (cherry picked from commit 45dd2eaac379e5576f745380260470204c49beac) --- cddl/contrib/opensolaris/tools/ctf/common/utils.c | 28 +---------------------- cddl/contrib/opensolaris/tools/ctf/common/utils.h | 2 -- 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 b9db1a870165..f74eb8de40fa 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 #include #include #include @@ -60,31 +59,6 @@ getpname(void) return (pname); } -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) { 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 6da2c2cf8b26..06c00a7b0e7f 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 #include #include #include +#include #include #include #include