diff options
Diffstat (limited to 'modules/devices')
| -rw-r--r-- | modules/devices/dmi_memory.c | 3 | ||||
| -rw-r--r-- | modules/devices/pci.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/modules/devices/dmi_memory.c b/modules/devices/dmi_memory.c index 19fafa80..86829216 100644 --- a/modules/devices/dmi_memory.c +++ b/modules/devices/dmi_memory.c @@ -787,7 +787,7 @@ gchar *memory_devices_get_info() { ); g_free(spd); moreinfo_add_with_prefix(tag_prefix, tag, details); /* moreinfo now owns *details */ - const gchar *mfgr = s->mfgr ? vendor_get_shortest_name(s->mfgr) : NULL; + gchar *mfgr = s->mfgr ? vendor_match_tag(s->mfgr, params.fmt_opts) : NULL; ret = h_strdup_cprintf("$!%s$%s=%s|%s|%s\n", ret, tag, @@ -796,6 +796,7 @@ gchar *memory_devices_get_info() { ); icons = h_strdup_cprintf("Icon$%s$=%s\n", icons, tag, mem_icon); g_free(size_str); + g_free(mfgr); } else { gchar *details = g_strdup_printf("[%s]\n" "%s=0x%"PRIx32", 0x%"PRIx32"\n" diff --git a/modules/devices/pci.c b/modules/devices/pci.c index bdff87d3..6efb425c 100644 --- a/modules/devices/pci.c +++ b/modules/devices/pci.c @@ -59,8 +59,6 @@ static const gchar *find_icon_for_class(uint32_t class) return "devices.png"; } -#include "format_early.h" - static gchar *_pci_dev(const pcid *p, gchar *icons) { gchar *str; gchar *class, *vendor, *svendor, *product, *sproduct; @@ -74,8 +72,8 @@ static gchar *_pci_dev(const pcid *p, gchar *icons) { product = UNKIFNULL_AC(p->device_id_str); sproduct = UNKIFNULL_AC(p->sub_device_id_str); - gchar *ven_tag = vendor_match_tag(p->vendor_id_str, FMT_OPT_PANGO); /* TODO:FIX FOR REPORT! */ - gchar *sven_tag = vendor_match_tag(p->sub_vendor_id_str, FMT_OPT_PANGO); /* TODO:FIX FOR REPORT! */ + gchar *ven_tag = vendor_match_tag(p->vendor_id_str, params.fmt_opts); + gchar *sven_tag = vendor_match_tag(p->sub_vendor_id_str, params.fmt_opts); if (ven_tag) { if (sven_tag && !vendor_is_svendor) { name = g_strdup_printf("%s %s %s", sven_tag, ven_tag, product); |