Rename nvme_path_get_subsystem()

hreinecke · hreinecke · commit 9fda26c59382 · 2022-02-01T11:31:05.000+01:00
Misnamed, should be nvme_path_get_ctrl() to be consistent with the
other library functions.

Signed-off-by: Hannes Reinecke &lt;hare@suse.de&gt;
diff --git a/doc/libnvme.rst b/doc/libnvme.rst
@@ -5643,7 +5643,7 @@ The nvme command status if a response was received (see
 ``nvme_path_t p``
 
 
-.. c:function:: nvme_ctrl_t nvme_path_get_subsystem (nvme_path_t p)
+.. c:function:: nvme_ctrl_t nvme_path_get_ctrl (nvme_path_t p)
 
 
 **Parameters**
diff --git a/doc/man/nvme_path_get_subsystem.2 b/doc/man/nvme_path_get_subsystem.2
diff --git a/src/libnvme.map b/src/libnvme.map
@@ -222,9 +222,9 @@ LIBNVME_1_0 {
 		nvme_nvm_identify_ctrl;
 		nvme_open;
 		nvme_path_get_ana_state;
+		nvme_path_get_ctrl;
 		nvme_path_get_name;
 		nvme_path_get_ns;
-		nvme_path_get_subsystem;
 		nvme_path_get_sysfs_dir;
 		nvme_paths_filter;
 		nvme_read;
diff --git a/src/nvme/tree.c b/src/nvme/tree.c
@@ -533,7 +533,7 @@ static int nvme_scan_subsystem(struct nvme_root *r, const char *name,
 	return -1;
 }
 
-nvme_ctrl_t nvme_path_get_subsystem(nvme_path_t p)
+nvme_ctrl_t nvme_path_get_ctrl(nvme_path_t p)
 {
 	return p->c;
 }
diff --git a/src/nvme/tree.h b/src/nvme/tree.h
@@ -658,12 +658,12 @@ const char *nvme_path_get_sysfs_dir(nvme_path_t p);
 const char *nvme_path_get_ana_state(nvme_path_t p);
 
 /**
- * nvme_path_get_subsystem() -
+ * nvme_path_get_ctrl() -
  * @p:
  *
  * Return: 
  */
-nvme_ctrl_t nvme_path_get_subsystem(nvme_path_t p);
+nvme_ctrl_t nvme_path_get_ctrl(nvme_path_t p);
 
 /**
  * nvme_path_get_ns() -

Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ static int nvme_scan_subsystem(struct nvme_root r, const char name,`
`533`	`533`	`return -1;`
`534`	`534`	`}`
`535`	`535`
`536`		`-nvme_ctrl_t nvme_path_get_subsystem(nvme_path_t p)`
	`536`	`+nvme_ctrl_t nvme_path_get_ctrl(nvme_path_t p)`
`537`	`537`	`{`
`538`	`538`	`return p->c;`
`539`	`539`	`}`