From 39ad6c3151eeda0e809519ff2a44c13a57b439d3 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Tue, 14 Mar 2017 16:44:30 -0700 Subject: [PATCH] bdev/nvme: Fix null terminator checks in trid The fields are char arrays, not pointers. Change-Id: Ieb21e7a70853ed582e459d167a66b1aa5b8c93d3 Signed-off-by: Seth Howell --- lib/bdev/nvme/blockdev_nvme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bdev/nvme/blockdev_nvme.c b/lib/bdev/nvme/blockdev_nvme.c index c14ba868f..ee410b58d 100644 --- a/lib/bdev/nvme/blockdev_nvme.c +++ b/lib/bdev/nvme/blockdev_nvme.c @@ -414,17 +414,17 @@ bdev_nvme_dump_config_json(struct spdk_bdev *bdev, struct spdk_json_write_ctx *w spdk_json_write_string(w, "Unknown"); } - if (nvme_ctrlr->trid.traddr) { + if (nvme_ctrlr->trid.traddr[0] != '\0') { spdk_json_write_name(w, "traddr"); spdk_json_write_string(w, nvme_ctrlr->trid.traddr); } - if (nvme_ctrlr->trid.trsvcid) { + if (nvme_ctrlr->trid.trsvcid[0] != '\0') { spdk_json_write_name(w, "trsvcid"); spdk_json_write_string(w, nvme_ctrlr->trid.trsvcid); } - if (nvme_ctrlr->trid.subnqn) { + if (nvme_ctrlr->trid.subnqn[0] != '\0') { spdk_json_write_name(w, "subnqn"); spdk_json_write_string(w, nvme_ctrlr->trid.subnqn); }