Author: mav
Date: Mon Aug 12 18:56:46 2019
New Revision: 350939
URL: https://svnweb.freebsd.org/changeset/base/350939
Log:
MFC r350311 (by imp):
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:
stable/12/sbin/nvmecontrol/logpage.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sbin/nvmecontrol/logpage.c
==============================================================================
--- stable/12/sbin/nvmecontrol/logpage.c Mon Aug 12 18:56:11 2019
(r350938)
+++ stable/12/sbin/nvmecontrol/logpage.c Mon Aug 12 18:56:46 2019
(r350939)
@@ -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;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
