Date: Fri, 22 Jan 2021 21:35:52 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: f302fd1aa673 - main - elfctl: fix typo from last-minute refactoring Message-ID: <202101222135.10MLZq7s009760@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f302fd1aa6730facd53a3f761e0a57302731b03e commit f302fd1aa6730facd53a3f761e0a57302731b03e Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2021-01-22 21:23:12 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2021-01-22 21:35:05 +0000 elfctl: fix typo from last-minute refactoring Reported by: jkim Fixes: 86f33b5fcf6087bf4439881011b920ff99e6e300 --- usr.bin/elfctl/elfctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/elfctl/elfctl.c b/usr.bin/elfctl/elfctl.c index f641b63e32bd..300a66eb516e 100644 --- a/usr.bin/elfctl/elfctl.c +++ b/usr.bin/elfctl/elfctl.c @@ -261,7 +261,7 @@ convert_to_feature_val(char *feature_str, uint32_t *feature_val) warn("%s invalid", feature); return (false); } - input != val; + input |= val; } else { warnx("%s is not a valid feature", feature); if (!iflag)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101222135.10MLZq7s009760>