From 4d63e9a6042335ac179666efa53e626cb0d723c3 Mon Sep 17 00:00:00 2001 From: jimharris Date: Wed, 26 Jun 2013 23:20:08 +0000 Subject: Create #defines for NVME_CTRLR_PREFIX and NVME_NS_PREFIX for the "nvme" and "ns" strings, rather than hardcoding the string values throughout the nvmecontrol code base. Sponsored by: Intel MFC after: 3 days --- sbin/nvmecontrol/devlist.c | 5 +++-- sbin/nvmecontrol/identify.c | 4 ++-- sbin/nvmecontrol/nvmecontrol.h | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sbin/nvmecontrol/devlist.c b/sbin/nvmecontrol/devlist.c index 4085e7e..8c99c99 100644 --- a/sbin/nvmecontrol/devlist.c +++ b/sbin/nvmecontrol/devlist.c @@ -78,7 +78,7 @@ devlist(int argc, char *argv[]) while (1) { ctrlr++; - sprintf(name, "nvme%d", ctrlr); + sprintf(name, "%s%d", NVME_CTRLR_PREFIX, ctrlr); exit_code = open_dev(name, &fd, 0, 0); @@ -95,7 +95,8 @@ devlist(int argc, char *argv[]) printf("%6s: %s\n", name, cdata.mn); for (i = 0; i < cdata.nn; i++) { - sprintf(name, "nvme%dns%d", ctrlr, i+1); + sprintf(name, "%s%d%s%d", NVME_CTRLR_PREFIX, ctrlr, + NVME_NS_PREFIX, i+1); read_namespace_data(fd, i+1, &nsdata); printf(" %10s (%lldGB)\n", name, diff --git a/sbin/nvmecontrol/identify.c b/sbin/nvmecontrol/identify.c index 6dcbebd..cd1d746 100644 --- a/sbin/nvmecontrol/identify.c +++ b/sbin/nvmecontrol/identify.c @@ -258,7 +258,7 @@ identify_ns(int argc, char *argv[]) * of the string. Don't search past 10 characters into the string, * otherwise we know it is malformed. */ - nsloc = strnstr(argv[optind], "ns", 10); + nsloc = strnstr(argv[optind], NVME_NS_PREFIX, 10); if (nsloc != NULL) nsid = strtol(nsloc + 2, NULL, 10); if (nsloc == NULL || (nsid == 0 && errno != 0)) { @@ -314,7 +314,7 @@ identify(int argc, char *argv[]) * If device node contains "ns", we consider it a namespace, * otherwise, consider it a controller. */ - if (strstr(target, "ns") == NULL) + if (strstr(target, NVME_NS_PREFIX) == NULL) identify_ctrlr(argc, argv); else identify_ns(argc, argv); diff --git a/sbin/nvmecontrol/nvmecontrol.h b/sbin/nvmecontrol/nvmecontrol.h index ec61e95..c05792e 100644 --- a/sbin/nvmecontrol/nvmecontrol.h +++ b/sbin/nvmecontrol/nvmecontrol.h @@ -31,6 +31,9 @@ #include +#define NVME_CTRLR_PREFIX "nvme" +#define NVME_NS_PREFIX "ns" + #define DEVLIST_USAGE \ " nvmecontrol devlist\n" -- cgit v1.1