Fix compilation errors; minor cleanups

6 files changed, 12 insertions, 12 deletions

diff --git a/hardinfo2/arch/linux/common/inputdevices.h b/hardinfo2/arch/linux/common/inputdevices.h
index e89e4b7e..20e4289c 100644
--- a/hardinfo2/arch/linux/common/inputdevices.h
+++ b/hardinfo2/arch/linux/common/inputdevices.h
@@ -118,7 +118,7 @@ __scan_input_devices(void)
 				      "Version=0x%x\n",
 				      strhash, product, version);
 	    
-            if (phis[1] != 0) {
+            if (phys[1] != 0) {
                  strhash = h_strdup_cprintf("Connected to=%s\n",
                                             strhash, phys);
             }
diff --git a/hardinfo2/arch/linux/x86/boots.h b/hardinfo2/arch/linux/x86/boots.h
index 97384500..e7ef0408 120000
--- a/hardinfo2/arch/linux/x86/boots.h
+++ b/hardinfo2/arch/linux/x86/boots.h
@@ -1 +1 @@
-../../../arch/linux/common/boots.h
\ No newline at end of file
+../../linux/common/boots.h
\ No newline at end of file
diff --git a/hardinfo2/benchmark.c b/hardinfo2/benchmark.c
index cd7b268d..3d6ba1fd 100644
--- a/hardinfo2/benchmark.c
+++ b/hardinfo2/benchmark.c
@@ -180,12 +180,11 @@ static gchar *__benchmark_include_results(gdouble result,
 			   	   "OrderType=%d\n"
 	   			   "ViewType=3\n"
 	   			   "ColumnTitle$Extra1=CPU Clock\n"
-		   		   "ColumnTitle$Extra2=Memory\n"
 			   	   "ColumnTitle$Progress=Results\n"
 			   	   "ColumnTitle$TextValue=CPU\n"
 			   	   "ShowColumnHeaders=true\n"
 	   			   "[%s]\n"
-		   		   "<big><b>This Machine</b></big>=%.3f|%s MHz|extra2\n"
+		   		   "<big><b>This Machine</b></big>=%.3f|%s MHz\n"
 			   	   "%s", order_type, benchmark, result, processor_frequency, results);
     g_free(processor_frequency);
     return return_value;
diff --git a/hardinfo2/computer.c b/hardinfo2/computer.c
index 3279631b..40c006b9 100644
--- a/hardinfo2/computer.c
+++ b/hardinfo2/computer.c
@@ -287,15 +287,14 @@ gchar *callback_modules()
 			   "[$ShellParam$]\n"
 			   "ViewType=1\n"
 			   "ColumnTitle$TextValue=Name\n"
-			   "ColumnTitle$Value=Full Name\n"
+			   "ColumnTitle$Value=Description\n"
 			   "ShowColumnHeaders=true\n", module_list);
 }
 
 gchar *callback_boots()
 {
     return g_strdup_printf("[$ShellParam$]\n"
-			   "ColumnTitle$TextValue=Date\n"
-			   "ColumnTitle$Extra1=Time\n"
+			   "ColumnTitle$TextValue=Date & Time\n"
 			   "ColumnTitle$Value=Kernel Version\n"
 			   "ShowColumnHeaders=true\n"
 			   "\n"
diff --git a/hardinfo2/configure b/hardinfo2/configure
index a5f698ce..d8113727 100755
--- a/hardinfo2/configure
+++ b/hardinfo2/configure
@@ -201,7 +201,7 @@ echo -e "#ifndef __CONFIG_H__\n#define __CONFIG_H__\n" > config.h
 
 echo "#define VERSION \"$VERSION\"" >> config.h
 
-echo "#define LSPCI \"$LSPCI -vk\"" >> config.h
+echo "#define LSPCI \"$LSPCI -v\"" >> config.h
 echo "#define $ARCH" >> config.h
 echo "#define ARCH     \"$ARCH\"" >> config.h
 
diff --git a/hardinfo2/report.c b/hardinfo2/report.c
index db86c5d8..253d8867 100644
--- a/hardinfo2/report.c
+++ b/hardinfo2/report.c
@@ -115,11 +115,9 @@ void report_table(ReportContext * ctx, gchar * text)
 		gchar *key = keys[j];
 		gchar *value;
 
-		value =
-		    g_key_file_get_value(key_file, tmpgroup, key, NULL);
+		value = g_key_file_get_value(key_file, tmpgroup, key, NULL);
 
-		if (g_utf8_validate(key, -1, NULL)
-		    && g_utf8_validate(value, -1, NULL)) {
+		if (g_utf8_validate(key, -1, NULL) && g_utf8_validate(value, -1, NULL)) {
 		    strend(key, '#');
 
 		    if (g_str_equal(value, "...")) {
@@ -128,6 +126,10 @@ void report_table(ReportContext * ctx, gchar * text)
 			    value = g_strdup("...");
 			}
 		    }
+		    
+		    if (strchr(value, '|')) {
+		        /* FIXME */
+		    }
 
 		    if (*key == '$') {
 			report_key_value(ctx, strchr(key + 1, '$') + 1,