From 2742b3f5e7e0a13dcd4136f357176a3362a0e778 Mon Sep 17 00:00:00 2001 From: "Leandro A. F. Pereira" Date: Fri, 30 May 2008 12:16:11 +0000 Subject: Fix usbfs display. Abort HardInfo if user choses not to load a module dependency (when using -m command-line switch). --- hardinfo2/arch/linux/common/usb.h | 2 +- hardinfo2/util.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hardinfo2/arch/linux/common/usb.h b/hardinfo2/arch/linux/common/usb.h index a102e6d0..cb939ff8 100644 --- a/hardinfo2/arch/linux/common/usb.h +++ b/hardinfo2/arch/linux/common/usb.h @@ -143,7 +143,7 @@ int __scan_usb_procfs(void) g_hash_table_foreach_remove(moreinfo, remove_usb_devices, NULL); g_free(usb_list); } - usb_list = g_strdup(""); + usb_list = g_strdup("[USB Devices]\n"); while (fgets(buffer, 128, dev)) { tmp = buffer; diff --git a/hardinfo2/util.c b/hardinfo2/util.c index 11d2ad28..f83fc1c2 100644 --- a/hardinfo2/util.c +++ b/hardinfo2/util.c @@ -705,8 +705,8 @@ static GSList *modules_check_deps(GSList * modules) modules = g_slist_prepend(modules, mod); modules = modules_check_deps(modules); /* re-check dependencies */ } else { - modules = g_slist_remove(modules, module); - module_free(module); + g_error("HardInfo cannot run without loading the additional module."); + exit(1); } gtk_widget_destroy(dialog); -- cgit v1.2.3