From 72ec147259f4104201309a2f6c243f4582f8a89c Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Thu, 14 Apr 2016 13:10:24 -0500 Subject: [PATCH] Re-order output of get-devices to be easier to read --- libfwupd/fwupd-enums-private.h | 1 + libfwupd/fwupd-result.c | 4 ++-- libfwupd/fwupd-self-test.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libfwupd/fwupd-enums-private.h b/libfwupd/fwupd-enums-private.h index ff46191f2..4b3df1014 100644 --- a/libfwupd/fwupd-enums-private.h +++ b/libfwupd/fwupd-enums-private.h @@ -30,6 +30,7 @@ #define FWUPD_RESULT_KEY_DEVICE_CHECKSUM_KIND "DeviceChecksumKind" /* u */ #define FWUPD_RESULT_KEY_DEVICE_MODIFIED "Modified" /* t */ #define FWUPD_RESULT_KEY_DEVICE_NAME "DisplayName" /* s */ +#define FWUPD_RESULT_KEY_DEVICE_ID "DeviceID" /* s */ #define FWUPD_RESULT_KEY_DEVICE_PROVIDER "Provider" /* s */ #define FWUPD_RESULT_KEY_DEVICE_VERSION "Version" /* s */ #define FWUPD_RESULT_KEY_DEVICE_VERSION_LOWEST "VersionLowest" /* s */ diff --git a/libfwupd/fwupd-result.c b/libfwupd/fwupd-result.c index 43fbdad7c..f22086167 100644 --- a/libfwupd/fwupd-result.c +++ b/libfwupd/fwupd-result.c @@ -1600,11 +1600,11 @@ fwupd_result_to_string (FwupdResult *result) /* not set when using GetDetails */ if (priv->device_id != NULL) - g_string_append_printf (str, "%s\n", priv->device_id); + g_string_append_printf (str, "%s\n", priv->device_name); /* device */ fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_GUID, priv->guid); - fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_DEVICE_NAME, priv->device_name); + fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_DEVICE_ID, priv->device_id); fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_DEVICE_DESCRIPTION, priv->device_description); fwupd_pad_kv_str (str, FWUPD_RESULT_KEY_DEVICE_PROVIDER, priv->device_provider); fwupd_pad_kv_dfl (str, FWUPD_RESULT_KEY_DEVICE_FLAGS, priv->device_flags); diff --git a/libfwupd/fwupd-self-test.c b/libfwupd/fwupd-self-test.c index 96e962a99..2f5919df0 100644 --- a/libfwupd/fwupd-self-test.c +++ b/libfwupd/fwupd-self-test.c @@ -125,9 +125,9 @@ fwupd_result_func (void) g_print ("\n%s", str); ret = as_test_compare_lines (str, - "USB:foo\n" + "ColorHug2\n" " Guid: 2082b5e0-7a64-478a-b1b2-e3404fab6dad\n" - " DisplayName: ColorHug2\n" + " DeviceID: USB:foo\n" " Flags: allow-offline|require-ac\n" " FirmwareHash: beefdead\n" " DeviceChecksumKind: sha256\n"