From nobody Sun Feb 26 01:54:58 2023 X-Original-To: dev-commits-src-all@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 4PPRXL2gk3z3v89X; Sun, 26 Feb 2023 01:54:58 +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 4PPRXL26vsz3Ljb; Sun, 26 Feb 2023 01:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677376498; 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=IAtRYq2lrqn0g8Yo3gjiGJ9az74LmLQIu1FlLj51evE=; b=EO5FTG3Ih60rt7jI/I3sWFm9bleQaRtHuiyOUbZ0ovfsYPFrfPIHA8LTUSH8hI0CCuNVR/ szwNSdNamK83nyIGPPVloUhs27MgP57PiEhEmp2zQ0fW+TosOxMGw8yl92zL6YE6HQYFHU RTr2fYfCDVldo9lLCOi/22DTKqSxhqHsgidLjwQgoCs7TlBO7K8+OFl4y7vN/YueayttJa OSCTJorKciD8DkKBP2umDa9iRxoy9m7cLHXlDzgVGX7X0kdf8Trt3Vj9ZTSA7nI5A1rDS1 HDVgDaA0TWd6FPdgc2Pfo4CHZt1zu3D85GJvQzBbMxVXIM/H4tkhoQJVidxSUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677376498; 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=IAtRYq2lrqn0g8Yo3gjiGJ9az74LmLQIu1FlLj51evE=; b=LDkp6uYRWtlmzw0qRPQDxj4SbULlJdsQjaWikCw6wzTNBMzdbtdJ/L2hengtlcunGA0Q6u W7vxj528NlBqOOETrZK5d7sOV0+x1m4olemE/3kEK4yS7u0Ecvf8hScsdkjGkDoBaMz3T4 4l66bLqNbDZmFUhVGIQV4wuU7DciCOcqLi9xLi6XtZ9idSIqI2T92NsH3doW7Bkf1J5UgD quosDoDOdi+8bBsvjt3piGSumF2ZzmPHSS26j889D5WSqYIGEIiTJ9NsDW/xMmOyiYqg7K 8Tc1W/LeJv3yk2xWAoraGBJo4VvIr1yYM0GdiFL9C+zVnV4qODNDqXaWab4qmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677376498; a=rsa-sha256; cv=none; b=W3R8MLzk+oAXw6OyAM4E3H2mtYjHcXa1krz1U6T/aHqU+4lnJN8WxnSemoWCcYI/ieQQG0 anbxUfHIHpyqjr8jfmi3lHGEtVfNTL5ze6XAFVx4XCzDhcPfSjeHbPGL6lqzpTeA/djewq XUPpiiCZdFtptyv/mJg9SkzH6r4df+9nTAVRTI1B/cCbh+CpKm8LIQc9d3K6KvSoW2DgZ5 GMCsf1h/m1fT/+6o9XXFORA8ToQByghwwawB1sK/G0PzhHZkU5uaecPbu5qMdUbfMrRTW8 B71/+419IdBvpnHnzCfj2eLzhZ6NLSVCziQnxqmr9kmHCF1HEzedb80JP8enKA== 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 4PPRXL18fFzRnV; Sun, 26 Feb 2023 01:54:58 +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 31Q1swhO061282; Sun, 26 Feb 2023 01:54:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31Q1swff061281; Sun, 26 Feb 2023 01:54:58 GMT (envelope-from git) Date: Sun, 26 Feb 2023 01:54:58 GMT Message-Id: <202302260154.31Q1swff061281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 994eb2fb8a90 - stable/13 - ctfdump: Use getprogname() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 994eb2fb8a901c883f2bd24fa29c6cd513cb4340 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=994eb2fb8a901c883f2bd24fa29c6cd513cb4340 commit 994eb2fb8a901c883f2bd24fa29c6cd513cb4340 Author: Zhenlei Huang AuthorDate: 2023-02-23 16:28:35 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-26 01:53:15 +0000 ctfdump: Use getprogname() Also remove no longer used function `getpname()`. Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D38740 (cherry picked from commit 3dd5524264095ed8612c28908e13f80668eff2f9) --- cddl/contrib/opensolaris/tools/ctf/common/utils.c | 24 ----------------------- cddl/contrib/opensolaris/tools/ctf/dump/dump.c | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/common/utils.c b/cddl/contrib/opensolaris/tools/ctf/common/utils.c index f74eb8de40fa..fda29486d94b 100644 --- a/cddl/contrib/opensolaris/tools/ctf/common/utils.c +++ b/cddl/contrib/opensolaris/tools/ctf/common/utils.c @@ -35,30 +35,6 @@ /*LINTLIBRARY*/ -static const char *pname; - -#pragma init(getpname) -const char * -getpname(void) -{ - const char *p, *q; - - if (pname != NULL) - return (pname); - - if ((p = getexecname()) != NULL) - q = strrchr(p, '/'); - else - q = NULL; - - if (q == NULL) - pname = p; - else - pname = q + 1; - - return (pname); -} - void vdie(const char *format, va_list alist) { diff --git a/cddl/contrib/opensolaris/tools/ctf/dump/dump.c b/cddl/contrib/opensolaris/tools/ctf/dump/dump.c index 06c00a7b0e7f..5cbf46af1b73 100644 --- a/cddl/contrib/opensolaris/tools/ctf/dump/dump.c +++ b/cddl/contrib/opensolaris/tools/ctf/dump/dump.c @@ -856,7 +856,7 @@ print_stats(void) static int print_usage(FILE *fp, int verbose) { - (void) fprintf(fp, "Usage: %s [-dfhlsSt] [-u file] file\n", getpname()); + (void) fprintf(fp, "Usage: %s [-dfhlsSt] [-u file] file\n", getprogname()); if (verbose) { (void) fprintf(fp,