From 50365733e3d762152a151121c692f3658096896d Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 6 Dec 2016 15:25:28 -0700 Subject: [PATCH] bdev/nvme: simplify nvme_version formatting Drop the complicated buffer size/strlen math and just split the version string formatting into two cases depending on whether the tertiary version is set. Change-Id: I4b4983cb8805e8734c408f473dd8c592ec8e8138 Signed-off-by: Daniel Verkamp --- lib/bdev/nvme/blockdev_nvme.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/bdev/nvme/blockdev_nvme.c b/lib/bdev/nvme/blockdev_nvme.c index 67a56399c..f50d8a1a3 100644 --- a/lib/bdev/nvme/blockdev_nvme.c +++ b/lib/bdev/nvme/blockdev_nvme.c @@ -375,13 +375,12 @@ blockdev_nvme_dump_config_json(struct spdk_bdev *bdev, struct spdk_json_write_ct spdk_json_write_name(w, "firmware_revision"); spdk_json_write_string(w, buf); - snprintf(buf, sizeof(buf), "%u.%u", vs.bits.mjr, vs.bits.mnr); - if (vs.bits.ter) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), - ".%u", vs.bits.ter); - } spdk_json_write_name(w, "nvme_version"); - spdk_json_write_string(w, buf); + if (vs.bits.ter) { + spdk_json_write_string_fmt(w, "%u.%u.%u", vs.bits.mjr, vs.bits.mnr, vs.bits.ter); + } else { + spdk_json_write_string_fmt(w, "%u.%u", vs.bits.mjr, vs.bits.mnr); + } spdk_json_write_name(w, "nsid"); spdk_json_write_uint32(w, spdk_nvme_ns_get_id(ns));