diff options
| -rw-r--r-- | hardinfo2/arch/common/printers.h | 2 | ||||
| -rw-r--r-- | hardinfo2/arch/linux/common/inputdevices.h | 10 | ||||
| -rw-r--r-- | hardinfo2/arch/linux/common/modules.h | 5 | ||||
| -rw-r--r-- | hardinfo2/arch/linux/x86/processor.h | 4 | ||||
| -rw-r--r-- | hardinfo2/util.c | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/hardinfo2/arch/common/printers.h b/hardinfo2/arch/common/printers.h index e2ab1656..fad80f25 100644 --- a/hardinfo2/arch/common/printers.h +++ b/hardinfo2/arch/common/printers.h @@ -73,7 +73,7 @@ __scan_printers(void) printer_list = g_strdup_printf("%s\n" "$PRN%d$" "%s=%s\n", - (char*)idle_free(printer_list), + printer_list, i, printers[i], g_str_equal(default_printer, printers[i]) ? diff --git a/hardinfo2/arch/linux/common/inputdevices.h b/hardinfo2/arch/linux/common/inputdevices.h index 28611f32..a7102335 100644 --- a/hardinfo2/arch/linux/common/inputdevices.h +++ b/hardinfo2/arch/linux/common/inputdevices.h @@ -88,10 +88,10 @@ __scan_input_devices(void) tmp = g_strdup_printf("INP%d", ++n); input_list = g_strdup_printf("%s$%s$%s=\n", - (char*)idle_free(input_list), + input_list, tmp, name); input_icons = g_strdup_printf("%sIcon$%s$%s=%s\n", - (char*)idle_free(input_icons), + input_icons, tmp, name, input_devices[d].icon); gchar *strhash = g_strdup_printf("[Device Information]\n" @@ -106,13 +106,13 @@ __scan_input_devices(void) if (url) { strhash = g_strdup_printf("%s" "Vendor=%s (%s)\n", - (char*)idle_free(strhash), + strhash, vendor_get_name(name), url); } else { strhash = g_strdup_printf("%s" "Vendor=%x\n", - (char*)idle_free(strhash), + strhash, vendor); } @@ -120,7 +120,7 @@ __scan_input_devices(void) "Product=0x%x\n" "Version=0x%x\n" "Connected to=%s\n", - (char*)idle_free(strhash), product, version, phys); + strhash, product, version, phys); g_hash_table_insert(moreinfo, tmp, strhash); g_free(phys); diff --git a/hardinfo2/arch/linux/common/modules.h b/hardinfo2/arch/linux/common/modules.h index bbde818a..fd5f0fa1 100644 --- a/hardinfo2/arch/linux/common/modules.h +++ b/hardinfo2/arch/linux/common/modules.h @@ -37,8 +37,9 @@ scan_modules_do(void) if (module_list) { g_free(module_list); - module_list = NULL; } + + module_list = g_strdup(""); g_hash_table_foreach_remove(moreinfo, remove_module_devices, NULL); @@ -99,7 +100,7 @@ scan_modules_do(void) /* append this module to the list of modules */ module_list = g_strdup_printf("%s$%s$%s=%s\n", - module_list ? (char*)idle_free(module_list) : "", + module_list, hashkey, modname, description ? description : ""); diff --git a/hardinfo2/arch/linux/x86/processor.h b/hardinfo2/arch/linux/x86/processor.h index 2aa2f8af..918bac7c 100644 --- a/hardinfo2/arch/linux/x86/processor.h +++ b/hardinfo2/arch/linux/x86/processor.h @@ -279,7 +279,7 @@ gchar *processor_get_capabilities_from_flags(gchar * strflags) } } - tmp = g_strdup_printf("%s%s=%s\n", (gchar*)idle_free(tmp), flags[j], meaning); + tmp = g_strdup_printf("%s%s=%s\n", tmp, flags[j], meaning); j++; } @@ -347,7 +347,7 @@ static gchar *processor_get_info(GSList * processors) processor = (Processor *) l->data; tmp = g_strdup_printf("%s$CPU%d$%s=%.2fMHz\n", - (gchar*)idle_free(tmp), processor->id, + tmp, processor->id, processor->model_name, processor->cpu_mhz); diff --git a/hardinfo2/util.c b/hardinfo2/util.c index 55d2985d..24e7967c 100644 --- a/hardinfo2/util.c +++ b/hardinfo2/util.c @@ -899,7 +899,7 @@ static gboolean __idle_free_do(gpointer ptr) gpointer idle_free(gpointer ptr) { if (ptr) { - g_timeout_add(10000, __idle_free_do, ptr); + g_timeout_add(15000, __idle_free_do, ptr); } return ptr; |