From owner-dev-commits-src-branches@freebsd.org Wed Aug 18 01:31:33 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6B07166EE42; Wed, 18 Aug 2021 01:31:33 +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 4Gq9NP2f8Mz4jWg; Wed, 18 Aug 2021 01:31:33 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 43D7E27BFB; Wed, 18 Aug 2021 01:31:33 +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 17I1VXK0022405; Wed, 18 Aug 2021 01:31:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17I1VX3I022404; Wed, 18 Aug 2021 01:31:33 GMT (envelope-from git) Date: Wed, 18 Aug 2021 01:31:33 GMT Message-Id: <202108180131.17I1VX3I022404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e3580ab6e64a - stable/12 - ar: remove invalid extra param in bsdar_warnc calls MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: e3580ab6e64a9ae6b8535419ad1724b37e30ce38 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Aug 2021 01:31:33 -0000 The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e3580ab6e64a9ae6b8535419ad1724b37e30ce38 commit e3580ab6e64a9ae6b8535419ad1724b37e30ce38 Author: Ed Maste AuthorDate: 2021-08-11 17:22:23 +0000 Commit: Ed Maste CommitDate: 2021-08-18 01:30:58 +0000 ar: remove invalid extra param in bsdar_warnc calls A number of warnings passed an exit status code to bsdar_warnc, but it does not take exit status (as a warning, it does not exit). MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 09319f7d3f8aefe8a6b37b1c2a6d842126a2c181) --- usr.bin/ar/write.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/ar/write.c b/usr.bin/ar/write.c index 24bac2f25b92..f515b2b4eb1e 100644 --- a/usr.bin/ar/write.c +++ b/usr.bin/ar/write.c @@ -787,7 +787,7 @@ create_symtab_entry(struct bsdar *bsdar, void *maddr, size_t size) return; } if (elf_getshstrndx(e, &shstrndx) == 0) { - bsdar_warnc(bsdar, EX_SOFTWARE, 0, "elf_getshstrndx failed: %s", + bsdar_warnc(bsdar, 0, "elf_getshstrndx failed: %s", elf_errmsg(-1)); elf_end(e); return; @@ -824,8 +824,8 @@ create_symtab_entry(struct bsdar *bsdar, void *maddr, size_t size) scn = NULL; while ((scn = elf_nextscn(e, scn)) != NULL) { if (gelf_getshdr(scn, &shdr) != &shdr) { - bsdar_warnc(bsdar, EX_SOFTWARE, 0, - "elf_getshdr failed: %s", elf_errmsg(-1)); + bsdar_warnc(bsdar, 0, "elf_getshdr failed: %s", + elf_errmsg(-1)); continue; } if (shdr.sh_type != SHT_SYMTAB) @@ -838,7 +838,7 @@ create_symtab_entry(struct bsdar *bsdar, void *maddr, size_t size) len = data->d_size / shdr.sh_entsize; for (i = 0; i < len; i++) { if (gelf_getsym(data, i, &sym) != &sym) { - bsdar_warnc(bsdar, EX_SOFTWARE, 0, + bsdar_warnc(bsdar, 0, "gelf_getsym failed: %s", elf_errmsg(-1)); continue; @@ -855,7 +855,7 @@ create_symtab_entry(struct bsdar *bsdar, void *maddr, size_t size) if ((name = elf_strptr(e, tabndx, sym.st_name)) == NULL) { - bsdar_warnc(bsdar, EX_SOFTWARE, 0, + bsdar_warnc(bsdar, 0, "elf_strptr failed: %s", elf_errmsg(-1)); continue; @@ -867,7 +867,7 @@ create_symtab_entry(struct bsdar *bsdar, void *maddr, size_t size) } elferr = elf_errno(); if (elferr != 0) - bsdar_warnc(bsdar, EX_SOFTWARE, 0, "elf_nextscn failed: %s", + bsdar_warnc(bsdar, 0, "elf_nextscn failed: %s", elf_errmsg(elferr)); elf_end(e);