Merge branch 'master' of git@github.com:lpereira/hardinfo

7 files changed, 21 insertions, 14 deletions

diff --git a/hardinfo2/arch/linux/alpha/processor.h b/hardinfo2/arch/linux/alpha/processor.h
index e6013103..1e5b014c 100644
--- a/hardinfo2/arch/linux/alpha/processor.h
+++ b/hardinfo2/arch/linux/alpha/processor.h
@@ -18,7 +18,7 @@
 
 struct _Processor {
     gchar *model_name;
-    gfloat bogomips;
+    gfloat bogomips, cpu_mhz;
     gchar *strmodel;
 };
 
@@ -52,6 +52,7 @@ __scan_processors(void)
     gchar *tmp = g_strconcat("Alpha ", processor->model_name, NULL);
     g_free(processor->model_name);
     processor->model_name = tmp;
+    processor->cpu_mhz = 0.0f;
 
     fclose(cpuinfo);
 
diff --git a/hardinfo2/arch/linux/armv4l/processor.h b/hardinfo2/arch/linux/armv4l/processor.h
index b64fd5eb..82b6be04 100644
--- a/hardinfo2/arch/linux/armv4l/processor.h
+++ b/hardinfo2/arch/linux/armv4l/processor.h
@@ -19,7 +19,7 @@
 struct _Processor {
     gchar *model_name;
     gchar *flags;
-    gfloat bogomips;
+    gfloat bogomips, cpu_mhz;
 
     gchar *has_fpu;
 };
@@ -53,6 +53,8 @@ __scan_processors(void)
 	g_strfreev(tmp);
     }
 
+    processor->cpu_mhz = 0.0f;
+
     fclose(cpuinfo);
 
     return g_slist_append(NULL, processor);
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);
diff --git a/hardinfo2/arch/linux/ia64/processor.h b/hardinfo2/arch/linux/ia64/processor.h
index d5e01776..d3d41519 100644
--- a/hardinfo2/arch/linux/ia64/processor.h
+++ b/hardinfo2/arch/linux/ia64/processor.h
@@ -19,7 +19,7 @@
 struct _Processor {
     gchar *model_name;
     gchar *vendor_id;
-    gfloat bogomips;
+    gfloat bogomips, cpu_mhz;
     gchar *strmodel;
 };
 
@@ -50,6 +50,8 @@ __scan_processors(void)
 	}
 	g_strfreev(tmp);
     }
+
+    processor->cpu_mhz = 0.0f;
     
     fclose(cpuinfo);
 
diff --git a/hardinfo2/arch/linux/s390/processor.h b/hardinfo2/arch/linux/s390/processor.h
index 1550d239..25dab8ca 100644
--- a/hardinfo2/arch/linux/s390/processor.h
+++ b/hardinfo2/arch/linux/s390/processor.h
@@ -19,7 +19,7 @@
 struct _Processor {
     gchar *vendor_id, *model_name;
     gint cache_size;
-    gfloat bogomips;
+    gfloat bogomips, cpu_mhz;
 };
 
 static GSList *
@@ -48,6 +48,8 @@ __scan_processors(void)
 	}
 	g_strfreev(tmp);
     }
+
+    processor->cpu_mhz = 0.0f;
     
     processor->model_name = g_strconcat("S390 ", processor->vendor_id, NULL);
     g_free(processor->vendor_id);
diff --git a/hardinfo2/arch/linux/sparc/processor.h b/hardinfo2/arch/linux/sparc/processor.h
index 3bbea922..0272c963 100644
--- a/hardinfo2/arch/linux/sparc/processor.h
+++ b/hardinfo2/arch/linux/sparc/processor.h
@@ -19,6 +19,7 @@
 struct _Processor {
     gchar *model_name;
     gchar *has_fpu;
+    gfloat cpu_mhz;
 };
 
 static GSList *
@@ -48,6 +49,8 @@ __scan_processors(void)
 
     fclose(cpuinfo);
 
+    processor->cpu_mhz = 0.0f;
+
     return g_slist_append(NULL, processor);
 }