Skip to content

Commit 5827806

Browse files
hreineckehreinecke
committed
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]>
1 parent e0c651d commit 5827806

11 files changed

Lines changed: 29 additions & 44 deletions

File tree

‎libnvme/examples/display-columnar.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ int main()
7070
nvme_ctrl_get_model(c),
7171
nvme_ctrl_get_firmware(c),
7272
nvme_ctrl_get_transport(c),
73-
nvme_ctrl_get_address(c),
73+
nvme_ctrl_get_traddr(c),
7474
nvme_subsystem_get_name(s));
7575

7676
nvme_ctrl_for_each_ns(c, n) {

‎libnvme/examples/display-tree.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ int main()
5454
_s ? '|' : ' ', _c ? '|' : '`',
5555
nvme_ctrl_get_name(c),
5656
nvme_ctrl_get_transport(c),
57-
nvme_ctrl_get_address(c),
57+
nvme_ctrl_get_traddr(c),
5858
nvme_ctrl_get_state(c));
5959

6060
nvme_ctrl_for_each_ns_safe(c, n, _n)

‎libnvme/libnvme/nvme.i‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ struct nvme_ns {
948948
}
949949

950950
const char *nvme_ctrl_address_get(nvme_ctrl_t c) {
951-
return nvme_ctrl_get_address(c);
951+
return nvme_ctrl_get_traddr(c);
952952
}
953953

954954
const char *nvme_ctrl_sysfs_dir_get(nvme_ctrl_t c) {

‎libnvme/src/libnvme.ld‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ LIBNVME_3 {
99
nvme_ctrl_match_config;
1010
nvme_ctrl_first_ns;
1111
nvme_ctrl_first_path;
12-
nvme_ctrl_get_address;
1312
nvme_ctrl_get_config;
1413
nvme_ctrl_get_phy_slot;
1514
nvme_ctrl_get_src_addr;

‎libnvme/src/nvme/fabrics.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2291,7 +2291,7 @@ int nvmf_discovery_config_json(struct nvme_global_ctx *ctx,
22912291
"failed to connect to hostnqn=%s,nqn=%s,%s\n",
22922292
nvme_host_get_hostnqn(h),
22932293
nvme_subsystem_get_name(s),
2294-
nvme_ctrl_get_address(c));
2294+
nvme_ctrl_get_traddr(c));
22952295

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

23552355
if (!ret)
23562356
ret = err;

‎libnvme/src/nvme/tree.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -910,11 +910,6 @@ const char *nvme_ctrl_get_subsysnqn(nvme_ctrl_t c)
910910
return c->s ? c->s->subsysnqn : c->subsysnqn;
911911
}
912912

913-
const char *nvme_ctrl_get_address(nvme_ctrl_t c)
914-
{
915-
return c->address ? c->address : "";
916-
}
917-
918913
char *nvme_ctrl_get_src_addr(nvme_ctrl_t c, char *src_addr, size_t src_addr_len)
919914
{
920915
size_t l;

‎libnvme/src/nvme/tree.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -716,15 +716,6 @@ struct nvme_transport_handle *nvme_ctrl_get_transport_handle(nvme_ctrl_t c);
716716
*/
717717
void nvme_ctrl_release_transport_handle(nvme_ctrl_t c);
718718

719-
/**
720-
* nvme_ctrl_get_address() - Address string of a controller
721-
* @c: Controller instance
722-
*
723-
* Return: NVMe-over-Fabrics address string of @c or empty string
724-
* of no address is present.
725-
*/
726-
const char *nvme_ctrl_get_address(nvme_ctrl_t c);
727-
728719
/**
729720
* nvme_ctrl_get_src_addr() - Extract src_addr from the c->address string
730721
* @c: Controller instance

‎libnvme/test/cpp.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ int main()
3939
nvme_subsystem_for_each_ctrl(s, c) {
4040
std::cout << " `- " << nvme_ctrl_get_name(c)
4141
<< " " << nvme_ctrl_get_transport(c)
42-
<< " " << nvme_ctrl_get_address(c)
42+
<< " " << nvme_ctrl_get_traddr(c)
4343
<< " " << nvme_ctrl_get_state(c)
4444
<< "\n";
4545
nvme_ctrl_for_each_ns(c, n) {

‎libnvme/test/test.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ int main(int argc, char **argv)
409409
nvme_subsystem_for_each_ctrl(s, c) {
410410
printf(" %s %s %s %s\n", nvme_ctrl_get_name(c),
411411
nvme_ctrl_get_transport(c),
412-
nvme_ctrl_get_address(c),
412+
nvme_ctrl_get_traddr(c),
413413
nvme_ctrl_get_state(c));
414414
}
415415
}
@@ -423,7 +423,7 @@ int main(int argc, char **argv)
423423
if (!nvme_scan_ctrl(ctx, ctrl, &c)) {
424424
printf("%s %s %s %s\n", nvme_ctrl_get_name(c),
425425
nvme_ctrl_get_transport(c),
426-
nvme_ctrl_get_address(c),
426+
nvme_ctrl_get_traddr(c),
427427
nvme_ctrl_get_state(c));
428428
nvme_free_ctrl(c);
429429
}
@@ -438,7 +438,7 @@ int main(int argc, char **argv)
438438
printf(" `- %s %s %s %s\n",
439439
nvme_ctrl_get_name(c),
440440
nvme_ctrl_get_transport(c),
441-
nvme_ctrl_get_address(c),
441+
nvme_ctrl_get_traddr(c),
442442
nvme_ctrl_get_state(c));
443443

444444
nvme_ctrl_for_each_ns(c, n) {

‎nvme-print-json.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2678,7 +2678,7 @@ static unsigned int json_print_nvme_subsystem_multipath(nvme_subsystem_t s, json
26782678
path_attrs = json_create_object();
26792679
obj_add_str(path_attrs, "Name", nvme_ctrl_get_name(c));
26802680
obj_add_str(path_attrs, "Transport", nvme_ctrl_get_transport(c));
2681-
obj_add_str(path_attrs, "Address", nvme_ctrl_get_address(c));
2681+
obj_add_str(path_attrs, "Address", nvme_ctrl_get_traddr(c));
26822682
obj_add_str(path_attrs, "State", nvme_ctrl_get_state(c));
26832683
obj_add_str(path_attrs, "ANAState", nvme_path_get_ana_state(p));
26842684
array_add_obj(paths, path_attrs);
@@ -2699,7 +2699,7 @@ static void json_print_nvme_subsystem_ctrls(nvme_subsystem_t s,
26992699
path_attrs = json_create_object();
27002700
obj_add_str(path_attrs, "Name", nvme_ctrl_get_name(c));
27012701
obj_add_str(path_attrs, "Transport", nvme_ctrl_get_transport(c));
2702-
obj_add_str(path_attrs, "Address", nvme_ctrl_get_address(c));
2702+
obj_add_str(path_attrs, "Address", nvme_ctrl_get_traddr(c));
27032703
obj_add_str(path_attrs, "State", nvme_ctrl_get_state(c));
27042704
array_add_obj(paths, path_attrs);
27052705
}
@@ -4663,7 +4663,7 @@ static void json_print_detail_list_multipath(nvme_subsystem_t s,
46634663
obj_add_str(jpath, "ModelNumber", nvme_ctrl_get_model(c));
46644664
obj_add_str(jpath, "Firmware", nvme_ctrl_get_firmware(c));
46654665
obj_add_str(jpath, "Transport", nvme_ctrl_get_transport(c));
4666-
obj_add_str(jpath, "Address", nvme_ctrl_get_address(c));
4666+
obj_add_str(jpath, "Address", nvme_ctrl_get_traddr(c));
46674667
obj_add_str(jpath, "Slot", nvme_ctrl_get_phy_slot(c));
46684668

46694669
array_add_obj(jpaths, jpath);
@@ -4691,7 +4691,7 @@ static void json_print_detail_list(nvme_subsystem_t s, struct json_object *jss)
46914691
obj_add_str(jctrl, "ModelNumber", nvme_ctrl_get_model(c));
46924692
obj_add_str(jctrl, "Firmware", nvme_ctrl_get_firmware(c));
46934693
obj_add_str(jctrl, "Transport", nvme_ctrl_get_transport(c));
4694-
obj_add_str(jctrl, "Address", nvme_ctrl_get_address(c));
4694+
obj_add_str(jctrl, "Address", nvme_ctrl_get_traddr(c));
46954695
obj_add_str(jctrl, "Slot", nvme_ctrl_get_phy_slot(c));
46964696

46974697
nvme_ctrl_for_each_ns(c, n) {
@@ -4799,7 +4799,7 @@ static void json_detail_list(struct nvme_global_ctx *ctx)
47994799
obj_add_str(jctrl, "ModelNumber", nvme_ctrl_get_model(c));
48004800
obj_add_str(jctrl, "Firmware", nvme_ctrl_get_firmware(c));
48014801
obj_add_str(jctrl, "Transport", nvme_ctrl_get_transport(c));
4802-
obj_add_str(jctrl, "Address", nvme_ctrl_get_address(c));
4802+
obj_add_str(jctrl, "Address", nvme_ctrl_get_traddr(c));
48034803
obj_add_str(jctrl, "Slot", nvme_ctrl_get_phy_slot(c));
48044804

48054805
nvme_ctrl_for_each_ns(c, n) {
@@ -4979,7 +4979,7 @@ static unsigned int json_subsystem_topology_multipath(nvme_subsystem_t s,
49794979
ctrl_attrs = json_create_object();
49804980
obj_add_str(ctrl_attrs, "Name", nvme_ctrl_get_name(c));
49814981
obj_add_str(ctrl_attrs, "Transport", nvme_ctrl_get_transport(c));
4982-
obj_add_str(ctrl_attrs, "Address", nvme_ctrl_get_address(c));
4982+
obj_add_str(ctrl_attrs, "Address", nvme_ctrl_get_traddr(c));
49834983
obj_add_str(ctrl_attrs, "State", nvme_ctrl_get_state(c));
49844984
array_add_obj(ctrls, ctrl_attrs);
49854985
obj_add_array(path_attrs, "Controller", ctrls);
@@ -5017,7 +5017,7 @@ static void json_print_nvme_subsystem_topology(nvme_subsystem_t s,
50175017
obj_add_str(ctrl_attrs, "Transport",
50185018
nvme_ctrl_get_transport(c));
50195019
obj_add_str(ctrl_attrs, "Address",
5020-
nvme_ctrl_get_address(c));
5020+
nvme_ctrl_get_traddr(c));
50215021
obj_add_str(ctrl_attrs, "State",
50225022
nvme_ctrl_get_state(c));
50235023

0 commit comments

Comments
 (0)