tree: rename nvme_disconnect_ctrl()

Rename nvme_ctrl_disconnect() to nvme_disconnect_ctrl() to avoid
name clash with SWIG generated interface files.

Signed-off-by: Hannes Reinecke <hare@suse.de>

diff --git a/examples/discover-loop.c b/examples/discover-loop.c
index e31e54054ab6210571ebf44fc1508a860a485a59..599edd205719efa3bb4c1e157452db79007a73d6 100644 (file)
--- a/examples/discover-loop.c
+++ b/examples/discover-loop.c
@@ -75,7 +75,7 @@ int main()
        }
 
        ret = nvmf_get_discovery_log(c, &log, 4);
-       nvme_ctrl_disconnect(c);
+       nvme_disconnect_ctrl(c);
        nvme_free_ctrl(c);
 
        if (ret)

diff --git a/src/nvme/tree.c b/src/nvme/tree.c
index bb24465d8666eaa1731a3d6f2a9cb57217796b8a..e118be529158972d26a8d168262d4d84ffdc5919 100644 (file)
--- a/src/nvme/tree.c
+++ b/src/nvme/tree.c
@@ -687,7 +687,7 @@ nvme_path_t nvme_ctrl_next_path(nvme_ctrl_t c, nvme_path_t p)
 
 #define FREE_CTRL_ATTR(a) \
        do { if (a) { free(a); (a) = NULL; } } while (0)
-int nvme_ctrl_disconnect(nvme_ctrl_t c)
+int nvme_disconnect_ctrl(nvme_ctrl_t c)
 {
        int ret;
 

diff --git a/src/nvme/tree.h b/src/nvme/tree.h
index ac45e3936fda42d71ff6e3cfa4844bcc8c90f8f6..c19b11389e4164b164b22254d58fbdd9c89efa17 100644 (file)
--- a/src/nvme/tree.h
+++ b/src/nvme/tree.h
@@ -856,12 +856,12 @@ void nvme_ctrl_disable_sqflow(nvme_ctrl_t c, bool disable_sqflow);
 int nvme_ctrl_identify(nvme_ctrl_t c, struct nvme_id_ctrl *id);
 
 /**
- * nvme_ctrl_disconnect() -
+ * nvme_disconnect_ctrl() -
  * @c:
  *
  * Return: 
  */
-int nvme_ctrl_disconnect(nvme_ctrl_t c);
+int nvme_disconnect_ctrl(nvme_ctrl_t c);
 
 /**
  * nvme_scan_ctrl() -