From 99d72ef7470171ec0fb44b357fc615e7a9829e3c Mon Sep 17 00:00:00 2001 From: Brandon Paupore Date: Tue, 17 Aug 2021 12:02:28 -0500 Subject: [PATCH] Print ProductName found even if subvendor/subdevice is unknown Signed-off-by: Brandon Paupore --- nvme-models.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/nvme-models.c b/nvme-models.c index 9b5077d0..8fd81520 100644 --- a/nvme-models.c +++ b/nvme-models.c @@ -76,22 +76,34 @@ static char *locate_info(char *data, bool is_inner, bool is_class) static void format_and_print(char *save) { - if (!class_mid) - snprintf(save, 1024, "%s %s %s", - locate_info(device_top, false, false), - locate_info(device_mid, false, false), - locate_info(device_final, true, false)); - else - snprintf(save, 1024, "%s: %s %s %s", - locate_info(class_mid, false, true), - locate_info(device_top, false, false), - locate_info(device_mid, false, false), - locate_info(device_final, true, false)); + if (!class_mid) { + if (device_final) + snprintf(save, 1024, "%s %s %s", + locate_info(device_top, false, false), + locate_info(device_mid, false, false), + locate_info(device_final, true, false)); + else + snprintf(save, 1024, "%s %s", + locate_info(device_top, false, false), + locate_info(device_mid, false, false)); + } else { + if (device_final) + snprintf(save, 1024, "%s: %s %s %s", + locate_info(class_mid, false, true), + locate_info(device_top, false, false), + locate_info(device_mid, false, false), + locate_info(device_final, true, false)); + else + snprintf(save, 1024, "%s: %s %s", + locate_info(class_mid, false, true), + locate_info(device_top, false, false), + locate_info(device_mid, false, false)); + } } static void format_all(char *save, char *vendor, char *device) { - if (device_top && device_mid && device_final) + if (device_top && device_mid) format_and_print(save); else if (device_top && !device_mid && class_mid) -- 2.50.1