hardinfo

Check-in [d5afcb6851]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:fix missing RAM memory due to functions of the same name being exported in different shared libraries (fix: make the functions private).
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:d5afcb6851c25af664f1f5e1657028193cc8de33
User & Date: jamesbond 2014-06-06 19:33:16
References
2014-07-28
17:01
revert commit [d5afcb6851]; fix the real cause of missing RAM display (use moreinfo_lookup rather than hi_more_info); fix usb display crashing (util.c now looks for lsusb in /usr/sbin first); fix glibc version not showing (glibc located in /lib64/libc.so.6); initial support for DDR3 spd-decoding (incomplete, the manufacturer is not shown yet). check-in: b571f0ca03 user: jamesbond tags: trunk
Context
2014-06-06
19:59
os database: Fatdog has to come before Puppy Linux as it shares some files with Puppy, otherwise Fatdog will be detected as Puppy Linux. check-in: b13faa87f3 user: jamesbond tags: trunk
19:33
fix missing RAM memory due to functions of the same name being exported in different shared libraries (fix: make the functions private). check-in: d5afcb6851 user: jamesbond tags: trunk
19:23
upstream: import all updates. check-in: cd126c2f50 user: jamesbond tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to modules/computer.c.

80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
    {N_("Groups"), "users.png", callback_groups, scan_groups, MODULE_FLAG_NONE},
    {NULL},
};

gchar *module_list = NULL;
Computer *computer = NULL;

gchar *hi_more_info(gchar * entry)
{
    gchar *info = moreinfo_lookup_with_prefix("COMP", entry);

    if (info)
	return g_strdup(info);

    return g_strdup_printf("[%s]", entry);







|







80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
    {N_("Groups"), "users.png", callback_groups, scan_groups, MODULE_FLAG_NONE},
    {NULL},
};

gchar *module_list = NULL;
Computer *computer = NULL;

static gchar *hi_more_info(gchar * entry)
{
    gchar *info = moreinfo_lookup_with_prefix("COMP", entry);

    if (info)
	return g_strdup(info);

    return g_strdup_printf("[%s]", entry);

Changes to modules/devices.c.

64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
...
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
void scan_usb(gboolean reload);
#if defined(ARCH_x86) || defined(ARCH_x86_64)
void scan_dmi(gboolean reload);
void scan_spd(gboolean reload);
#endif
void scan_device_resources(gboolean reload);

gchar *hi_more_info(gchar *entry);

static ModuleEntry entries[] = {
    {N_("Processor"), "processor.png", callback_processors, scan_processors, MODULE_FLAG_NONE},
    {N_("Memory"), "memory.png", callback_memory, scan_memory, MODULE_FLAG_NONE},
    {N_("PCI Devices"), "devices.png", callback_pci, scan_pci, MODULE_FLAG_NONE},
    {N_("USB Devices"), "usb.png", callback_usb, scan_usb, MODULE_FLAG_NONE},
    {N_("Printers"), "printer.png", callback_printers, scan_printers, MODULE_FLAG_NONE},
................................................................................
	{"getMotherboard", get_motherboard},
	{NULL}
    };

    return m;
}

gchar *hi_more_info(gchar * entry)
{
    gchar *info = moreinfo_lookup_with_prefix("DEV", entry);
    
    if (info)
	return g_strdup(info);

    return g_strdup("?");







|







 







|







64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
...
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
void scan_usb(gboolean reload);
#if defined(ARCH_x86) || defined(ARCH_x86_64)
void scan_dmi(gboolean reload);
void scan_spd(gboolean reload);
#endif
void scan_device_resources(gboolean reload);

static gchar *hi_more_info(gchar *entry);

static ModuleEntry entries[] = {
    {N_("Processor"), "processor.png", callback_processors, scan_processors, MODULE_FLAG_NONE},
    {N_("Memory"), "memory.png", callback_memory, scan_memory, MODULE_FLAG_NONE},
    {N_("PCI Devices"), "devices.png", callback_pci, scan_pci, MODULE_FLAG_NONE},
    {N_("USB Devices"), "usb.png", callback_usb, scan_usb, MODULE_FLAG_NONE},
    {N_("Printers"), "printer.png", callback_printers, scan_printers, MODULE_FLAG_NONE},
................................................................................
	{"getMotherboard", get_motherboard},
	{NULL}
    };

    return m;
}

static gchar *hi_more_info(gchar * entry)
{
    gchar *info = moreinfo_lookup_with_prefix("DEV", entry);
    
    if (info)
	return g_strdup(info);

    return g_strdup("?");

Changes to modules/network.c.

375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
{
    return g_strdup_printf("%s\n"
                           "[$ShellParam$]\n"
                           "ReloadInterval=3000\n",
                            __statistics);
}

gchar *hi_more_info(gchar * entry)
{
    gchar *info = moreinfo_lookup_with_prefix("NET", entry);

    if (info)
	return g_strdup(info);

    return g_strdup_printf("[%s]", entry);







|







375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
{
    return g_strdup_printf("%s\n"
                           "[$ShellParam$]\n"
                           "ReloadInterval=3000\n",
                            __statistics);
}

static gchar *hi_more_info(gchar * entry)
{
    gchar *info = moreinfo_lookup_with_prefix("NET", entry);

    if (info)
	return g_strdup(info);

    return g_strdup_printf("[%s]", entry);