From 7aeb5ac87c6105bd8fcc9b1fd12e37ba1550f587 Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@ubuntu.com>
Date: Mon, 19 Jun 2017 14:38:43 -0500
Subject: Import Upstream version 0.4.2.2

---
 arch/linux/common/pci.h | 41 +++++++++++++----------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

(limited to 'arch/linux/common/pci.h')

diff --git a/arch/linux/common/pci.h b/arch/linux/common/pci.h
index e50691d0..554c3dca 100644
--- a/arch/linux/common/pci.h
+++ b/arch/linux/common/pci.h
@@ -24,14 +24,8 @@ __scan_pci(void)
     gchar *category = NULL, *name = NULL;
     gint n = 0;
 
-    //if (g_file_test("/usr/bin/gksudo", G_FILE_TEST_EXISTS)) {
-    //  lspci = popen("gksudo '/bin/lspci -v'", "r");
-    //} else {
-    lspci = popen(LSPCI, "r");
-    //}
-
-    if (!lspci) {
-	return;
+    if (!(lspci = popen(LSPCI, "r"))) {
+      goto pci_error;
     }
 
     gchar *icon;
@@ -66,32 +60,24 @@ __scan_pci(void)
 	    g_strfreev(list);
 
 	    if (irq)
-		strdevice = g_strdup_printf("%sIRQ=%d\n", strdevice, irq);
+		strdevice = h_strdup_cprintf("IRQ=%d\n", strdevice, irq);
 	    if (freq)
-		strdevice =
-		    g_strdup_printf("%sFrequency=%dMHz\n", strdevice,
-				    freq);
+		strdevice = h_strdup_cprintf("Frequency=%dMHz\n", strdevice, freq);
 	    if (latency)
-		strdevice =
-		    g_strdup_printf("%sLatency=%d\n", strdevice, latency);
+		strdevice = h_strdup_cprintf("Latency=%d\n", strdevice, latency);
 
-	    strdevice =
-		g_strdup_printf("%sBus Master=%s\n", strdevice,
-				bus_master ? "Yes" : "No");
+	    strdevice = h_strdup_cprintf("Bus Master=%s\n", strdevice, bus_master ? "Yes" : "No");
 	} else if (!strncmp(buf, "Subsystem", 9)) {
 	    WALK_UNTIL(' ');
 	    buf++;
-	    strdevice =
-		g_strdup_printf("%sOEM Vendor=%s\n", strdevice, buf);
+	    strdevice = h_strdup_cprintf("OEM Vendor=%s\n", strdevice, buf);
 	} else if (!strncmp(buf, "Capabilities", 12)
 		   && !strstr(buf, "only to root") && 
 		      !strstr(buf, "access denied")) {
 	    WALK_UNTIL(' ');
 	    WALK_UNTIL(']');
 	    buf++;
-	    strdevice =
-		g_strdup_printf("%sCapability#%d=%s\n", strdevice, ++x,
-				buf);
+	    strdevice = h_strdup_cprintf("Capability#%d=%s\n", strdevice, ++x, buf);
 	} else if (!strncmp(buf, "Memory at", 9) && strstr(buf, "[size=")) {
 	    gint mem;
 	    gchar unit;
@@ -104,7 +90,7 @@ __scan_pci(void)
 	    WALK_UNTIL('[');
 	    sscanf(buf, "[size=%d%c", &mem, &unit);
 
-	    strdevice = g_strdup_printf("%sMemory#%d=%d%cB (%s%s)\n",
+	    strdevice = h_strdup_cprintf("Memory#%d=%d%cB (%s%s)\n",
 					strdevice, ++x,
 					mem,
 					(unit == ']') ? ' ' : unit,
@@ -118,7 +104,7 @@ __scan_pci(void)
 	    sscanf(buf, "I/O ports at %x [size=%d]", &io_addr, &io_size);
 
 	    strdevice =
-		g_strdup_printf("%sI/O ports at#%d=0x%x - 0x%x\n",
+		h_strdup_cprintf("I/O ports at#%d=0x%x - 0x%x\n",
 				strdevice, ++x, io_addr,
 				io_addr + io_size);
 	} else if ((buf[0] >= '0' && buf[0] <= '9') && (buf[4] == ':' || buf[2] == ':')) {
@@ -174,22 +160,21 @@ __scan_pci(void)
             
             const gchar *url = vendor_get_url(name);
             if (url) {
-                strdevice = g_strdup_printf("%s"
-                                            "Vendor=%s (%s)\n",
+                strdevice = h_strdup_cprintf("Vendor=%s (%s)\n",
                                             strdevice,
                                             vendor_get_name(name),
                                             url);
             }
             
             
-	    pci_list = g_strdup_printf("%s$PCI%d$%s=%s\n", pci_list, n, category,
-				name);
+	    pci_list = h_strdup_cprintf("$PCI%d$%s=%s\n", pci_list, n, category, name);
 
 	    n++;
 	}
     }
     
     if (pclose(lspci)) {
+pci_error:
         /* error (no pci, perhaps?) */
         pci_list = g_strconcat(pci_list, "No PCI devices found=\n", NULL);
     } else if (strhash) {
-- 
cgit v1.2.3