From 141aa4621dc7e10097b3db18bfefa6a7438aef68 Mon Sep 17 00:00:00 2001 From: Keith Busch Date: Sat, 15 Feb 2020 10:37:11 -0800 Subject: [PATCH] Remove nvme- prefix on files We're already in the nvme-cli project, no need to namespace the files further. Signed-off-by: Keith Busch --- Makefile | 8 +-- nvme-builtin.h => builtin.h | 2 +- libnvme | 2 +- nvme-lightnvm.c => lightnvm.c | 4 +- nvme-lightnvm.h => lightnvm.h | 0 nvme-models.c => models.c | 2 +- nvme-models.h => models.h | 0 nvme-filters.c | 88 -------------------------------- nvme.c | 4 +- plugins/dera/dera-nvme.c | 2 +- plugins/huawei/huawei-nvme.c | 2 +- plugins/intel/intel-nvme.c | 2 +- plugins/lnvm/lnvm-nvme.c | 4 +- plugins/memblaze/memblaze-nvme.c | 2 +- plugins/micron/micron-nvme.c | 2 +- plugins/seagate/seagate-nvme.c | 2 +- plugins/shannon/shannon-nvme.c | 2 +- plugins/toshiba/toshiba-nvme.c | 2 +- plugins/virtium/virtium-nvme.c | 2 +- plugins/wdc/wdc-nvme.c | 2 +- nvme-print.c => print.c | 4 +- nvme-print.h => print.h | 0 22 files changed, 25 insertions(+), 113 deletions(-) rename nvme-builtin.h => builtin.h (99%) rename nvme-lightnvm.c => lightnvm.c (99%) rename nvme-lightnvm.h => lightnvm.h (100%) rename nvme-models.c => models.c (99%) rename nvme-models.h => models.h (100%) delete mode 100644 nvme-filters.c rename nvme-print.c => print.c (99%) rename nvme-print.h => print.h (100%) diff --git a/Makefile b/Makefile index 1538572..50c5392 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ override CFLAGS += -DNVME_VERSION='"$(NVME_VERSION)"' NVME_DPKG_VERSION=1~`lsb_release -sc` -OBJS := nvme-print.o nvme-lightnvm.o nvme-models.o plugin.o nvme-filters.o +OBJS := print.o lightnvm.o models.o plugin.o filters.o UTIL_OBJS := util/argconfig.o util/suffix.o util/json.o util/parser.o @@ -87,13 +87,13 @@ nvme: nvme.c nvme.h libnvme $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) NVME-VERSION-FIL verify-no-dep: nvme.c nvme.h $(OBJS) NVME-VERSION-FILE $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $< -o $@ $(OBJS) $(LDFLAGS) -nvme.o: nvme.c nvme.h nvme-print.h util/argconfig.h util/suffix.h nvme-lightnvm.h fabrics.h +nvme.o: nvme.c nvme.h print.h util/argconfig.h util/suffix.h lightnvm.h fabrics.h $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -c $< $(LDFLAGS) -%.o: %.c %.h nvme.h nvme-print.h util/argconfig.h +%.o: %.c %.h nvme.h print.h util/argconfig.h $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -o $@ -c $< $(LDFLAGS) -%.o: %.c nvme.h nvme-print.h util/argconfig.h +%.o: %.c nvme.h print.h util/argconfig.h $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -o $@ -c $< $(LDFLAGS) doc: $(NVME) diff --git a/nvme-builtin.h b/builtin.h similarity index 99% rename from nvme-builtin.h rename to builtin.h index bfb907d..216c0a0 100644 --- a/nvme-builtin.h +++ b/builtin.h @@ -1,5 +1,5 @@ #undef CMD_INC_FILE -#define CMD_INC_FILE nvme-builtin +#define CMD_INC_FILE builtin #if !defined(NVME_BUILTIN) || defined(CMD_HEADER_MULTI_READ) #define NVME_BUILTIN diff --git a/libnvme b/libnvme index 147f49f..6aa114f 160000 --- a/libnvme +++ b/libnvme @@ -1 +1 @@ -Subproject commit 147f49f1261c055a84839fce0bc1eb50905a9044 +Subproject commit 6aa114f8a58222d38bfc9e083e804f1b50ad7401 diff --git a/nvme-lightnvm.c b/lightnvm.c similarity index 99% rename from nvme-lightnvm.c rename to lightnvm.c index e757caf..c432473 100644 --- a/nvme-lightnvm.c +++ b/lightnvm.c @@ -30,8 +30,8 @@ #include #include -#include "nvme-lightnvm.h" -#include "nvme-print.h" +#include "lightnvm.h" +#include "print.h" static int lnvm_open(void) { diff --git a/nvme-lightnvm.h b/lightnvm.h similarity index 100% rename from nvme-lightnvm.h rename to lightnvm.h diff --git a/nvme-models.c b/models.c similarity index 99% rename from nvme-models.c rename to models.c index 9b5077d..67c8921 100644 --- a/nvme-models.c +++ b/models.c @@ -7,7 +7,7 @@ #include #include #include -#include "nvme-models.h" +#include "models.h" static char *_fmt1 = "/sys/class/nvme/nvme%d/device/subsystem_vendor"; static char *_fmt2 = "/sys/class/nvme/nvme%d/device/subsystem_device"; diff --git a/nvme-models.h b/models.h similarity index 100% rename from nvme-models.h rename to models.h diff --git a/nvme-filters.c b/nvme-filters.c deleted file mode 100644 index a4133f8..0000000 --- a/nvme-filters.c +++ /dev/null @@ -1,88 +0,0 @@ -#include -#include -#include - -#include "nvme.h" - -/* global, used for controller specific namespace filter */ -int current_index; - -int scan_namespace_filter(const struct dirent *d) -{ - int i, n; - - if (d->d_name[0] == '.') - return 0; - - if (strstr(d->d_name, "nvme")) - if (sscanf(d->d_name, "nvme%dn%d", &i, &n) == 2) - return 1; - return 0; -} - -int scan_ctrl_paths_filter(const struct dirent *d) -{ - int id, cntlid, nsid; - - if (d->d_name[0] == '.') - return 0; - - if (strstr(d->d_name, "nvme")) { - if (sscanf(d->d_name, "nvme%dc%dn%d", &id, &cntlid, &nsid) == 3) - return 1; - if (sscanf(d->d_name, "nvme%dn%d", &id, &nsid) == 2) - return 1; - } - - return 0; -} - -int scan_ctrls_filter(const struct dirent *d) -{ - int id, nsid; - - if (d->d_name[0] == '.') - return 0; - - if (strstr(d->d_name, "nvme")) { - if (sscanf(d->d_name, "nvme%dn%d", &id, &nsid) == 2) - return 0; - if (sscanf(d->d_name, "nvme%dn", &id) == 1) - return 1; - return 0; - } - - return 0; -} - -int scan_subsys_filter(const struct dirent *d) -{ - int id; - - if (d->d_name[0] == '.') - return 0; - - if (strstr(d->d_name, "nvme-subsys")) { - if (sscanf(d->d_name, "nvme-subsys%d", &id) != 1) - return 0; - return 1; - } - - return 0; -} - -int scan_dev_filter(const struct dirent *d) -{ - int ctrl, ns, part; - - if (d->d_name[0] == '.') - return 0; - - if (strstr(d->d_name, "nvme")) { - if (sscanf(d->d_name, "nvme%dn%dp%d", &ctrl, &ns, &part) == 3) - return 0; - if (sscanf(d->d_name, "nvme%dn%d", &ctrl, &ns) == 2) - return ctrl == current_index; - } - return 0; -} diff --git a/nvme.c b/nvme.c index 1fe7840..11dafb7 100644 --- a/nvme.c +++ b/nvme.c @@ -28,7 +28,7 @@ #include #include "nvme.h" -#include "nvme-print.h" +#include "print.h" #include "plugin.h" #include "argconfig.h" @@ -37,7 +37,7 @@ #define MAX_DISC_RETRIES 10 #define CREATE_CMD -#include "nvme-builtin.h" +#include "builtin.h" #define ARRAY_SIZE(x) sizeof(x) / sizeof(*x) diff --git a/plugins/dera/dera-nvme.c b/plugins/dera/dera-nvme.c index 49b9bc7..a21f07b 100644 --- a/plugins/dera/dera-nvme.c +++ b/plugins/dera/dera-nvme.c @@ -10,7 +10,7 @@ #include #include "nvme.h" -#include "nvme-print.h" +#include "print.h" #include "plugin.h" #include "argconfig.h" diff --git a/plugins/huawei/huawei-nvme.c b/plugins/huawei/huawei-nvme.c index e61a277..497bb1f 100644 --- a/plugins/huawei/huawei-nvme.c +++ b/plugins/huawei/huawei-nvme.c @@ -27,7 +27,7 @@ #include #include "nvme.h" -#include "nvme-print.h" +#include "print.h" #include "plugin.h" #include "json.h" diff --git a/plugins/intel/intel-nvme.c b/plugins/intel/intel-nvme.c index 0c4c0da..db4340d 100644 --- a/plugins/intel/intel-nvme.c +++ b/plugins/intel/intel-nvme.c @@ -7,7 +7,7 @@ #include "common.h" #include "nvme.h" -#include "nvme-print.h" +#include "print.h" #include "json.h" #include "plugin.h" diff --git a/plugins/lnvm/lnvm-nvme.c b/plugins/lnvm/lnvm-nvme.c index 3fad40c..26a2072 100644 --- a/plugins/lnvm/lnvm-nvme.c +++ b/plugins/lnvm/lnvm-nvme.c @@ -4,10 +4,10 @@ #include #include "nvme.h" -#include "nvme-print.h" +#include "print.h" #include "plugin.h" -#include "nvme-lightnvm.h" +#include "lightnvm.h" #include "argconfig.h" #include "suffix.h" diff --git a/plugins/memblaze/memblaze-nvme.c b/plugins/memblaze/memblaze-nvme.c index 906fb72..754e3ea 100644 --- a/plugins/memblaze/memblaze-nvme.c +++ b/plugins/memblaze/memblaze-nvme.c @@ -5,7 +5,7 @@ #include #include "nvme.h" -#include "nvme-print.h" +#include "print.h" #include "plugin.h" #include "argconfig.h" diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c index 1c8ad99..000ab16 100644 --- a/plugins/micron/micron-nvme.c +++ b/plugins/micron/micron-nvme.c @@ -10,7 +10,7 @@ #include #include #include "nvme.h" -#include "nvme-print.h" +#include "print.h" #include #include diff --git a/plugins/seagate/seagate-nvme.c b/plugins/seagate/seagate-nvme.c index 998e1d7..a068ab3 100644 --- a/plugins/seagate/seagate-nvme.c +++ b/plugins/seagate/seagate-nvme.c @@ -30,7 +30,7 @@ #include #include #include "nvme.h" -#include "nvme-print.h" +#include "print.h" #include "plugin.h" #include "argconfig.h" #include "suffix.h" diff --git a/plugins/shannon/shannon-nvme.c b/plugins/shannon/shannon-nvme.c index 612a729..01c9239 100644 --- a/plugins/shannon/shannon-nvme.c +++ b/plugins/shannon/shannon-nvme.c @@ -7,7 +7,7 @@ #include "common.h" #include "nvme.h" -#include "nvme-print.h" +#include "print.h" #include "json.h" #include "plugin.h" diff --git a/plugins/toshiba/toshiba-nvme.c b/plugins/toshiba/toshiba-nvme.c index 0966e8c..7d1084f 100644 --- a/plugins/toshiba/toshiba-nvme.c +++ b/plugins/toshiba/toshiba-nvme.c @@ -8,7 +8,7 @@ #include #include "nvme.h" -#include "nvme-print.h" +#include "print.h" #include "plugin.h" #include "argconfig.h" #include "suffix.h" diff --git a/plugins/virtium/virtium-nvme.c b/plugins/virtium/virtium-nvme.c index 8c7923d..9cf193c 100644 --- a/plugins/virtium/virtium-nvme.c +++ b/plugins/virtium/virtium-nvme.c @@ -10,7 +10,7 @@ #include #include "nvme.h" -#include "nvme-print.h" +#include "print.h" #include "plugin.h" #include "argconfig.h" #include "suffix.h" diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c index 5d42c47..875f79c 100644 --- a/plugins/wdc/wdc-nvme.c +++ b/plugins/wdc/wdc-nvme.c @@ -31,7 +31,7 @@ #include "common.h" #include "nvme.h" -#include "nvme-print.h" +#include "print.h" #include "plugin.h" #include "json.h" diff --git a/nvme-print.c b/print.c similarity index 99% rename from nvme-print.c rename to print.c index 93b9661..5d6d53a 100644 --- a/nvme-print.c +++ b/print.c @@ -7,9 +7,9 @@ #include -#include "nvme-print.h" +#include "print.h" +#include "models.h" #include "util/json.h" -#include "nvme-models.h" #include "util/suffix.h" #include "common.h" diff --git a/nvme-print.h b/print.h similarity index 100% rename from nvme-print.h rename to print.h -- 2.50.1