git: 09319f7d3f8a - main - ar: remove invalid extra param in bsdar_warnc calls

[Ed Maste]

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=09319f7d3f8aefe8a6b37b1c2a6d842126a2c181

commit 09319f7d3f8aefe8a6b37b1c2a6d842126a2c181
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-08-11 17:22:23 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
CommitDate: 2021-08-11 17:27:19 +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
---
 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 4cbdc12dcc2d..4177f57d064a 100644
--- a/usr.bin/ar/write.c
+++ b/usr.bin/ar/write.c
@@ -796,7 +796,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;
@@ -833,8 +833,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)
@@ -847,7 +847,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;
@@ -864,7 +864,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;
@@ -876,7 +876,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);