diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-11-20 07:04:39 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-11-20 07:04:39 +0000 |
| commit | b8210b1af6dd369a577b2ea2c2fa0f25bffaa3f4 (patch) | |
| tree | 0f8475e9ba10b301bd87788e60d1759e8855e414 /nvme-models.c | |
| parent | Releasing debian version 1.15-4. (diff) | |
| download | nvme-cli-b8210b1af6dd369a577b2ea2c2fa0f25bffaa3f4.tar.xz nvme-cli-b8210b1af6dd369a577b2ea2c2fa0f25bffaa3f4.zip | |
Merging upstream version 1.16.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'nvme-models.c')
| -rw-r--r-- | nvme-models.c | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/nvme-models.c b/nvme-models.c index 9b5077d..8fd8152 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) |