From adfef917311d2fe853bbbcd64c22766ad35b5e9c Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 24 Feb 2022 16:07:59 +0000 Subject: [PATCH] trivial: Strip leading and trailing spaces from the vendor name --- libfwupdplugin/fu-device.c | 9 ++++++++- libfwupdplugin/fu-self-test.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libfwupdplugin/fu-device.c b/libfwupdplugin/fu-device.c index 22cb8a65f..3fd6978ec 100644 --- a/libfwupdplugin/fu-device.c +++ b/libfwupdplugin/fu-device.c @@ -2255,7 +2255,14 @@ fu_device_fixup_vendor_name(FuDevice *self) void fu_device_set_vendor(FuDevice *self, const gchar *vendor) { - fwupd_device_set_vendor(FWUPD_DEVICE(self), vendor); + g_autofree gchar *vendor_safe = NULL; + + /* trim any leading and trailing spaces */ + if (vendor != NULL) + vendor_safe = fu_common_strstrip(vendor); + + /* proxy */ + fwupd_device_set_vendor(FWUPD_DEVICE(self), vendor_safe); fu_device_fixup_vendor_name(self); } diff --git a/libfwupdplugin/fu-self-test.c b/libfwupdplugin/fu-self-test.c index 320d7e5ba..8779446a5 100644 --- a/libfwupdplugin/fu-self-test.c +++ b/libfwupdplugin/fu-self-test.c @@ -263,7 +263,7 @@ fu_device_name_func(void) g_autoptr(FuDevice) device2 = fu_device_new(); /* vendor then name */ - fu_device_set_vendor(device1, "Hughski"); + fu_device_set_vendor(device1, " Hughski "); fu_device_set_name(device1, "HUGHSKI ColorHug(TM)__Pro "); g_assert_cmpstr(fu_device_get_vendor(device1), ==, "Hughski"); g_assert_cmpstr(fu_device_get_name(device1), ==, "ColorHug™ Pro");