Author: imp
Date: Wed Jul 24 23:08:49 2019
New Revision: 350311
URL: https://svnweb.freebsd.org/changeset/base/350311
Log:
Fix the fix to the logic bug. Upon further testing, the bug is that we shadoow
opt.vendor with vendor. We shouldn't. Delete the latter and use the former
everywhere and restore the prior logic which is now correct.
Modified:
head/sbin/nvmecontrol/logpage.c
Modified: head/sbin/nvmecontrol/logpage.c
==============================================================================
--- head/sbin/nvmecontrol/logpage.c Wed Jul 24 23:04:59 2019
(r350310)
+++ head/sbin/nvmecontrol/logpage.c Wed Jul 24 23:08:49 2019
(r350311)
@@ -403,7 +403,6 @@ logpage(const struct cmd *f, int argc, char *argv[])
char cname[64];
uint32_t nsid, size;
void *buf;
- const char *vendor = NULL;
const struct logpage_function *lpf;
struct nvme_controller_data cdata;
print_fn_t print_fn;
@@ -465,8 +464,8 @@ logpage(const struct cmd *f, int argc, char *argv[])
* unless the vendors match.
*/
SLIST_FOREACH(lpf, &logpages, link) {
- if (lpf->vendor == NULL || vendor == NULL ||
- strcmp(lpf->vendor, vendor) != 0)
+ if (lpf->vendor != NULL && opt.vendor != NULL &&
+ strcmp(lpf->vendor, opt.vendor) != 0)
continue;
if (opt.page != lpf->log_page)
continue;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
