diff options
| author | Burt P <pburt0@gmail.com> | 2017-07-15 05:24:14 -0500 |
|---|---|---|
| committer | Leandro Pereira <leandro@hardinfo.org> | 2017-07-19 07:20:40 -0700 |
| commit | f75a1b3a9fa26e9cc86f76ea8d8c252a72a2bcd4 (patch) | |
| tree | b3d2ed3c3c0c96261344e9019323a0ba45769f35 | |
| parent | 8ef5a360719653f106861134ca842699daedeeb4 (diff) | |
All module entries must have name != NULL
Hack a way to skip unavailable entries. Now "Resources" is
avaialbe outside of x86 when it wasn't before.
Signed-off-by: Burt P <pburt0@gmail.com>
| -rw-r--r-- | hardinfo/util.c | 2 | ||||
| -rw-r--r-- | modules/devices.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/hardinfo/util.c b/hardinfo/util.c index e70120a4..36f6ea0b 100644 --- a/hardinfo/util.c +++ b/hardinfo/util.c @@ -730,6 +730,8 @@ static ShellModule *module_load(gchar * filename) entries = get_module_entries(); while (entries[i].name) { + if (*entries[i].name == '#') { i++; continue; } /* skip */ + ShellModuleEntry *entry = g_new0(ShellModuleEntry, 1); if (params.gui_running) { diff --git a/modules/devices.c b/modules/devices.c index eadc9dd8..9a97eee8 100644 --- a/modules/devices.c +++ b/modules/devices.c @@ -103,11 +103,14 @@ static ModuleEntry entries[] = { #if defined(ARCH_x86) || defined(ARCH_x86_64) [ENTRY_DMI] = {N_("DMI"), "computer.png", callback_dmi, scan_dmi, MODULE_FLAG_NONE}, [ENTRY_SPD] = {N_("Memory SPD"), "memory.png", callback_spd, scan_spd, MODULE_FLAG_NONE}, + [ENTRY_DTREE] = {"#"}, #else + [ENTRY_DMI] = {"#"}, + [ENTRY_SPD] = {"#"}, [ENTRY_DTREE] = {N_("Device Tree"), "devices.png", callback_dtree, scan_dtree, MODULE_FLAG_NONE}, #endif /* x86 or x86_64 */ [ENTRY_RESOURCES] = {N_("Resources"), "resources.png", callback_device_resources, scan_device_resources, MODULE_FLAG_NONE}, - {NULL} + { NULL } }; static GSList *processors = NULL; |