Skip to content

Commit 3785918

Browse files
committed
tree: loop address may be NULL
Return an empty string in nvme_ctrl_get_address() and not a NULL to get a better output. Signed-off-by: Hannes Reinecke <[email protected]>
1 parent 8ff2753 commit 3785918

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

src/nvme/tree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ const char *nvme_ctrl_get_subsysnqn(nvme_ctrl_t c)
669669

670670
const char *nvme_ctrl_get_address(nvme_ctrl_t c)
671671
{
672-
return c->address;
672+
return c->address ? c->address : "";
673673
}
674674

675675
const char *nvme_ctrl_get_firmware(nvme_ctrl_t c)

src/nvme/tree.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,8 @@ const char *nvme_ctrl_get_sysfs_dir(nvme_ctrl_t c);
735735
* nvme_ctrl_get_address() - Address string of an nvme_ctrl_t
736736
* @c: nvme_ctrl_t object
737737
*
738-
* Return: NVMe-over-Fabrics address string of @c
738+
* Return: NVMe-over-Fabrics address string of @c or empty string
739+
* of no address is present.
739740
*/
740741
const char *nvme_ctrl_get_address(nvme_ctrl_t c);
741742

0 commit comments

Comments
 (0)