diff options
Diffstat (limited to 'hardinfo2/arch/linux/common')
| -rw-r--r-- | hardinfo2/arch/linux/common/filesystem.h | 4 | ||||
| -rw-r--r-- | hardinfo2/arch/linux/common/net.h | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/hardinfo2/arch/linux/common/filesystem.h b/hardinfo2/arch/linux/common/filesystem.h index 3581ccbb..b3008387 100644 --- a/hardinfo2/arch/linux/common/filesystem.h +++ b/hardinfo2/arch/linux/common/filesystem.h @@ -81,9 +81,9 @@ scan_filesystems(void) stravail); g_hash_table_insert(moreinfo, g_strdup_printf("FS%d", ++count), strhash); - fs_list = h_strdup_cprintf("$FS%d$%s=%s total, %s free\n", + fs_list = h_strdup_cprintf("$FS%d$%s=%s|%s\n", fs_list, - count, tmp[0], strsize, stravail); + count, tmp[0], stravail, strsize); g_free(strsize); g_free(stravail); diff --git a/hardinfo2/arch/linux/common/net.h b/hardinfo2/arch/linux/common/net.h index de978ee1..8c083a9e 100644 --- a/hardinfo2/arch/linux/common/net.h +++ b/hardinfo2/arch/linux/common/net.h @@ -314,7 +314,7 @@ static void scan_net_interfaces_24(void) gint trash; gchar ifacename[16]; gchar *buf = buffer; - gchar *iface_type, *iface_icon, *ip; + gchar *iface_type, *iface_icon; gint i; buf = g_strstrip(buf); @@ -340,16 +340,13 @@ static void scan_net_interfaces_24(void) devid = g_strdup_printf("NET%s", ifacename); - ip = g_strdup_printf(" (%s)", ni.ip); network_interfaces = h_strdup_cprintf - ("$%s$%s=Sent %.2lfMiB, received %.2lfMiB%s\n", - network_interfaces, devid, ifacename, trans_mb, recv_mb, - ni.ip[0] ? ip : ""); - g_free(ip); - + ("$%s$%s=%s|Sent %.2lfMiB, received %.2lfMiB\n", + network_interfaces, devid, ifacename, ni.ip[0] ? ni.ip : "", + trans_mb, recv_mb); net_get_iface_type(ifacename, &iface_type, &iface_icon, &ni); - + network_icons = h_strdup_cprintf("Icon$%s$%s=%s.png\n", network_icons, devid, ifacename, iface_icon); |