libnvme: drop duplicate function nvme_ctrl_get_address()

There already is an accessor function nvme_ctrl_get_traddr(), so use that
instead and drop the old function.

Signed-off-by: Hannes Reinecke <[email protected]>

Author: hreinecke

libnvme/examples/display-columnar.c

@@ -70,7 +70,7 @@ int main()
 				       nvme_ctrl_get_model(c),
 				       nvme_ctrl_get_firmware(c),
 				       nvme_ctrl_get_transport(c),
-				       nvme_ctrl_get_address(c),
+				       nvme_ctrl_get_traddr(c),
 				       nvme_subsystem_get_name(s));
 
 				nvme_ctrl_for_each_ns(c, n) {

libnvme/examples/display-tree.c

@@ -54,7 +54,7 @@ int main()
 				       _s ? '|' : ' ', _c ? '|' : '`',
 				       nvme_ctrl_get_name(c),
 				       nvme_ctrl_get_transport(c),
-				       nvme_ctrl_get_address(c),
+				       nvme_ctrl_get_traddr(c),
 				       nvme_ctrl_get_state(c));
 
 				nvme_ctrl_for_each_ns_safe(c, n, _n)

libnvme/libnvme/nvme.i

@@ -948,7 +948,7 @@ struct nvme_ns {
 	}
 
 	const char *nvme_ctrl_address_get(nvme_ctrl_t c) {
-		return nvme_ctrl_get_address(c);
+		return nvme_ctrl_get_traddr(c);
 	}
 
 	const char *nvme_ctrl_sysfs_dir_get(nvme_ctrl_t c) {

libnvme/src/libnvme.ld

@@ -9,7 +9,6 @@ LIBNVME_3 {
 		nvme_ctrl_match_config;
 		nvme_ctrl_first_ns;
 		nvme_ctrl_first_path;
-		nvme_ctrl_get_address;
 		nvme_ctrl_get_config;
 		nvme_ctrl_get_phy_slot;
 		nvme_ctrl_get_src_addr;

libnvme/src/nvme/accessors.h

@@ -369,22 +369,22 @@ const char *nvme_ctrl_get_sqsize(const struct nvme_ctrl *p);
 void nvme_ctrl_set_transport(struct nvme_ctrl *p, const char *transport);
 
 /**
- * nvme_ctrl_get_transport() - Get transport.
+ * nvme_ctrl_get_transport() - Get transport type.
  * @p: The &struct nvme_ctrl instance to query.
  *
  * Return: The value of the transport field, or NULL if not set.
  */
 const char *nvme_ctrl_get_transport(const struct nvme_ctrl *p);
 
 /**
- * nvme_ctrl_set_traddr() - Set traddr.
+ * nvme_ctrl_set_traddr() - Set transport address.
  * @p: The &struct nvme_ctrl instance to update.
  * @traddr: New string; a copy is stored. Pass NULL to clear.
  */
 void nvme_ctrl_set_traddr(struct nvme_ctrl *p, const char *traddr);
 
 /**
- * nvme_ctrl_get_traddr() - Get traddr.
+ * nvme_ctrl_get_traddr() - Get transport address.
  * @p: The &struct nvme_ctrl instance to query.
  *
  * Return: The value of the traddr field, or NULL if not set.

libnvme/src/nvme/fabrics.c

@@ -2291,7 +2291,7 @@ int nvmf_discovery_config_json(struct nvme_global_ctx *ctx,
 						"failed to connect to hostnqn=%s,nqn=%s,%s\n",
 						nvme_host_get_hostnqn(h),
 						nvme_subsystem_get_name(s),
-						nvme_ctrl_get_address(c));
+						nvme_ctrl_get_traddr(c));
 
 					if (!ret)
 						ret = err;
@@ -2350,7 +2350,7 @@ int nvmf_connect_config_json(struct nvme_global_ctx *ctx,
 						 "failed to connect to hostnqn=%s,nqn=%s,%s\n",
 						 nvme_host_get_hostnqn(h),
 						 nvme_subsystem_get_name(s),
-						 nvme_ctrl_get_address(c));
+						 nvme_ctrl_get_traddr(c));
 
 					if (!ret)
 						ret = err;

libnvme/src/nvme/tree.c

@@ -910,11 +910,6 @@ const char *nvme_ctrl_get_subsysnqn(nvme_ctrl_t c)
 	return c->s ? c->s->subsysnqn : c->subsysnqn;
 }
 
-const char *nvme_ctrl_get_address(nvme_ctrl_t c)
-{
-	return c->address ? c->address : "";
-}
-
 char *nvme_ctrl_get_src_addr(nvme_ctrl_t c, char *src_addr, size_t src_addr_len)
 {
 	size_t l;

libnvme/src/nvme/tree.h

@@ -716,15 +716,6 @@ struct nvme_transport_handle *nvme_ctrl_get_transport_handle(nvme_ctrl_t c);
  */
 void nvme_ctrl_release_transport_handle(nvme_ctrl_t c);
 
-/**
- * nvme_ctrl_get_address() - Address string of a controller
- * @c:	Controller instance
- *
- * Return: NVMe-over-Fabrics address string of @c or empty string
- * of no address is present.
- */
-const char *nvme_ctrl_get_address(nvme_ctrl_t c);
-
 /**
  * nvme_ctrl_get_src_addr() - Extract src_addr from the c->address string
  * @c:	Controller instance

libnvme/test/cpp.cc

@@ -39,7 +39,7 @@ int main()
 			nvme_subsystem_for_each_ctrl(s, c) {
 				std::cout << " `- " << nvme_ctrl_get_name(c)
 					  << " " << nvme_ctrl_get_transport(c)
-					  << " " << nvme_ctrl_get_address(c)
+					  << " " << nvme_ctrl_get_traddr(c)
 					  << " " << nvme_ctrl_get_state(c)
 					  << "\n";
 				nvme_ctrl_for_each_ns(c, n) {

libnvme/test/test.c

@@ -409,7 +409,7 @@ int main(int argc, char **argv)
 			nvme_subsystem_for_each_ctrl(s, c) {
 				printf("  %s %s %s %s\n", nvme_ctrl_get_name(c),
 				       nvme_ctrl_get_transport(c),
-				       nvme_ctrl_get_address(c),
+				       nvme_ctrl_get_traddr(c),
 				       nvme_ctrl_get_state(c));
 			}
 		}
@@ -423,7 +423,7 @@ int main(int argc, char **argv)
 	if (!nvme_scan_ctrl(ctx, ctrl, &c)) {
 		printf("%s %s %s %s\n", nvme_ctrl_get_name(c),
 			nvme_ctrl_get_transport(c),
-			nvme_ctrl_get_address(c),
+			nvme_ctrl_get_traddr(c),
 			nvme_ctrl_get_state(c));
 		nvme_free_ctrl(c);
 	}
@@ -438,7 +438,7 @@ int main(int argc, char **argv)
 				printf(" `- %s %s %s %s\n",
 				       nvme_ctrl_get_name(c),
 				       nvme_ctrl_get_transport(c),
-				       nvme_ctrl_get_address(c),
+				       nvme_ctrl_get_traddr(c),
 				       nvme_ctrl_get_state(c));
 
 				nvme_ctrl_for_each_ns(c, n) {