Cleanups. Plug most of the memleaks.

11 files changed, 60 insertions, 77 deletions

diff --git a/hardinfo2/arch/linux/common/battery.h b/hardinfo2/arch/linux/common/battery.h
index 072ac00c..4a38b842 100644
--- a/hardinfo2/arch/linux/common/battery.h
+++ b/hardinfo2/arch/linux/common/battery.h
@@ -92,7 +92,7 @@ __scan_battery_acpi(void)
           if (g_str_equal(present, "yes")) {
             charge_rate = atof(remaining) / atof(capacity);
           
-            battery_list = g_strdup_printf("%s\n[Battery: %s]\n"
+            battery_list = h_strdup_cprintf("\n[Battery: %s]\n"
                                            "State=%s (load: %s)\n"
                                            "Capacity=%s / %s (%.2f%%)\n"
                                            "Battery Technology=%s (%s)\n"
@@ -174,7 +174,7 @@ __scan_battery_apm(void)
     }
 
     if (stotal && sremaining) {
-        battery_list = g_strdup_printf("%s\n[Battery (APM)]\n"
+        battery_list = h_strdup_cprintf("\n[Battery (APM)]\n"
                                        "Charge=%d%%\n"
                                        "Remaining Charge=%s of %s\n"
                                        "Using=%s\n"
@@ -186,7 +186,7 @@ __scan_battery_apm(void)
                                        ac_status[ac_bat],
                                        apm_drv_ver, apm_bios_ver);
     } else {
-        battery_list = g_strdup_printf("%s\n[Battery (APM)]\n"
+        battery_list = h_strdup_cprintf("\n[Battery (APM)]\n"
                                        "Charge=%d%%\n"
                                        "Using=%s\n"
                                        "APM driver version=%s\n"
diff --git a/hardinfo2/arch/linux/common/boots.h b/hardinfo2/arch/linux/common/boots.h
index c95ba321..d3428ea9 100644
--- a/hardinfo2/arch/linux/common/boots.h
+++ b/hardinfo2/arch/linux/common/boots.h
@@ -25,7 +25,7 @@ scan_boots_real(void)
     scan_os(FALSE);
 
     if (!computer->os->boots)
-      computer->os->boots = "[Boots]\n";
+      computer->os->boots = g_strdup("[Boots]\n");
     else
       return;
     
@@ -48,7 +48,7 @@ scan_boots_real(void)
           }
 
           tmp = g_strsplit(buffer, " ", 5);
-          computer->os->boots = g_strdup_printf("%s\n%s=Kernel %s",
+          computer->os->boots = h_strdup_cprintf("\n%s=Kernel %s",
                                                 computer->os->boots,
                                                 tmp[4],
                                                 tmp[3]);
diff --git a/hardinfo2/arch/linux/common/devmemory.h b/hardinfo2/arch/linux/common/devmemory.h
index 780ab12f..5eafe599 100644
--- a/hardinfo2/arch/linux/common/devmemory.h
+++ b/hardinfo2/arch/linux/common/devmemory.h
@@ -27,8 +27,9 @@ static void __scan_memory()
     if (offset == -1) {
         /* gah. linux 2.4 adds three lines of data we don't need in
            /proc/meminfo */
-        offset = strstr(idle_free(module_call_method("computer::getOSKernel")),
-                        "Linux 2.4") ? 3 : 0;
+        gchar *os_kernel = module_call_method("computer::getOSKernel");
+        offset = strstr(os_kernel, "Linux 2.4") ? 3 : 0;
+        g_free(os_kernel);
     }
     
     g_file_get_contents("/proc/meminfo", &meminfo, NULL, NULL);
diff --git a/hardinfo2/arch/linux/common/filesystem.h b/hardinfo2/arch/linux/common/filesystem.h
index b08bd39c..d8166fc3 100644
--- a/hardinfo2/arch/linux/common/filesystem.h
+++ b/hardinfo2/arch/linux/common/filesystem.h
@@ -81,7 +81,7 @@ scan_filesystems(void)
 					  stravail);
 		g_hash_table_insert(moreinfo, g_strdup_printf("FS%d", ++count), strhash);
 
-		fs_list = g_strdup_printf("%s$FS%d$%s=%s total, %s free\n",
+		fs_list = h_strdup_cprintf("$FS%d$%s=%s total, %s free\n",
 					  fs_list,
 					  count, tmp[0], strsize, stravail);
 
diff --git a/hardinfo2/arch/linux/common/inputdevices.h b/hardinfo2/arch/linux/common/inputdevices.h
index a7102335..8d2d8427 100644
--- a/hardinfo2/arch/linux/common/inputdevices.h
+++ b/hardinfo2/arch/linux/common/inputdevices.h
@@ -87,10 +87,10 @@ __scan_input_devices(void)
 	    }
 	
 	    tmp = g_strdup_printf("INP%d", ++n);
-	    input_list = g_strdup_printf("%s$%s$%s=\n",
+	    input_list = h_strdup_cprintf("$%s$%s=\n",
 					 input_list,
 					 tmp, name);
-	    input_icons = g_strdup_printf("%sIcon$%s$%s=%s\n",
+	    input_icons = h_strdup_cprintf("Icon$%s$%s=%s\n",
 				 	  input_icons,
 					  tmp, name,
 					  input_devices[d].icon);
@@ -104,20 +104,17 @@ __scan_input_devices(void)
 
 	    const gchar *url = vendor_get_url(name);
 	    if (url) {
-	    	strhash = g_strdup_printf("%s"
-					  "Vendor=%s (%s)\n",
+	    	strhash = h_strdup_cprintf("Vendor=%s (%s)\n",
 					  strhash,
 					  vendor_get_name(name),
 					  url);
 	    } else {
-	    	strhash = g_strdup_printf("%s"
-					  "Vendor=%x\n",
+	    	strhash = h_strdup_cprintf("Vendor=%x\n",
 					  strhash,
 					  vendor);
 	    }
 
-	    strhash = g_strdup_printf("%s"
-				      "Product=0x%x\n"
+	    strhash = h_strdup_cprintf("Product=0x%x\n"
 				      "Version=0x%x\n"
 				      "Connected to=%s\n",
 				      strhash, product, version, phys);
diff --git a/hardinfo2/arch/linux/common/modules.h b/hardinfo2/arch/linux/common/modules.h
index fd5f0fa1..6fbe13bd 100644
--- a/hardinfo2/arch/linux/common/modules.h
+++ b/hardinfo2/arch/linux/common/modules.h
@@ -39,8 +39,7 @@ scan_modules_do(void)
         g_free(module_list);
     }
     
-    module_list = g_strdup("");
-
+    module_list = NULL;
     g_hash_table_foreach_remove(moreinfo, remove_module_devices, NULL);
 
     lsmod = popen("/sbin/lsmod", "r");
@@ -99,7 +98,7 @@ scan_modules_do(void)
 	}
 
 	/* append this module to the list of modules */
-	module_list = g_strdup_printf("%s$%s$%s=%s\n",
+	module_list = h_strdup_cprintf("$%s$%s=%s\n",
 				      module_list,
 				      hashkey,
 				      modname,
@@ -130,7 +129,7 @@ scan_modules_do(void)
 	if (deps && strlen(deps)) {
 	    gchar **tmp = g_strsplit(deps, ",", 0);
 
-	    strmodule = g_strconcat(strmodule,
+	    strmodule = h_strconcat(strmodule,
                                     "\n[Dependencies]\n",
                                     g_strjoinv("=\n", tmp),
                                     "=\n", NULL);
diff --git a/hardinfo2/arch/linux/common/net.h b/hardinfo2/arch/linux/common/net.h
index bac08f38..527da1df 100644
--- a/hardinfo2/arch/linux/common/net.h
+++ b/hardinfo2/arch/linux/common/net.h
@@ -210,7 +210,7 @@ scan_net_interfaces_24(void)
             devid = g_strdup_printf("NET%s", ifacename);
             
             ip = g_strdup_printf(" (%s)", ni.ip);
-	    network_interfaces = g_strdup_printf("%s$%s$%s=Sent %.2fMiB, received %.2fMiB%s\n",
+	    network_interfaces = h_strdup_cprintf("$%s$%s=Sent %.2fMiB, received %.2fMiB%s\n",
                                                   network_interfaces,
                                                   devid,
                                                   ifacename,
@@ -220,7 +220,7 @@ scan_net_interfaces_24(void)
             g_free(ip);
             
             net_get_iface_type(ifacename, &iface_type, &iface_icon);
-	    network_icons = g_strdup_printf("%sIcon$%s$%s=%s.png\n",
+	    network_icons = h_strdup_cprintf("Icon$%s$%s=%s.png\n",
 	                                    network_icons, devid,
 	                                    ifacename, iface_icon);
             
@@ -240,8 +240,7 @@ scan_net_interfaces_24(void)
                                         trans_bytes, trans_mb);
                                         
             if (ni.ip[0] || ni.mask[0] || ni.broadcast[0]) {
-                 detailed = g_strdup_printf("%s\n"
-                                            "[Internet Protocol (IPv4)]\n"
+                 detailed = h_strdup_cprintf("\n[Internet Protocol (IPv4)]\n"
                                             "IP Address=%s\n"
                                             "Mask=%s\n"
                                             "Broadcast Address=%s\n",
diff --git a/hardinfo2/arch/linux/common/pci.h b/hardinfo2/arch/linux/common/pci.h
index d6a59bcb..554c3dca 100644
--- a/hardinfo2/arch/linux/common/pci.h
+++ b/hardinfo2/arch/linux/common/pci.h
@@ -60,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;
@@ -98,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,
@@ -112,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] == ':')) {
@@ -168,16 +160,14 @@ __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++;
 	}
diff --git a/hardinfo2/arch/linux/common/sensors.h b/hardinfo2/arch/linux/common/sensors.h
index 460c628b..bc84014b 100644
--- a/hardinfo2/arch/linux/common/sensors.h
+++ b/hardinfo2/arch/linux/common/sensors.h
@@ -147,8 +147,7 @@ static void read_sensors_hwmon(void)
     gchar *path_hwmon, *path_sensor, *tmp, *driver, *name, *mon;
     hwmon = 0;
 
-    path_hwmon =
-	g_strdup_printf("/sys/class/hwmon/hwmon%d/device/", hwmon);
+    path_hwmon = g_strdup_printf("/sys/class/hwmon/hwmon%d/device/", hwmon);
     while (g_file_test(path_hwmon, G_FILE_TEST_EXISTS)) {
 	tmp = g_strdup_printf("%sdriver", path_hwmon);
 	driver = g_file_read_link(tmp, NULL);
@@ -174,7 +173,7 @@ static void read_sensors_hwmon(void)
 	    mon = g_strdup_printf("fan%d", count);
 	    name = get_sensor_label(mon);
 	    if (!g_str_equal(name, "ignore")) {
-		sensors = g_strdup_printf("%s%s=%.0fRPM\n",
+		sensors = h_strdup_cprintf("%s=%.0fRPM\n",
 					  sensors, name,
 					  adjust_sensor(mon, atof(tmp)));
 	    }
@@ -197,7 +196,7 @@ static void read_sensors_hwmon(void)
 	    mon = g_strdup_printf("temp%d", count);
 	    name = get_sensor_label(mon);
 	    if (!g_str_equal(name, "ignore")) {
-		sensors = g_strdup_printf("%s%s=%.2f\302\260C\n",
+		sensors = h_strdup_cprintf("%s=%.2f\302\260C\n",
 					  sensors, name,
 					  adjust_sensor(mon,
 							atof(tmp) /
@@ -223,7 +222,7 @@ static void read_sensors_hwmon(void)
 	    mon = g_strdup_printf("in%d", count);
 	    name = get_sensor_label(mon);
 	    if (!g_str_equal(name, "ignore")) {
-		sensors = g_strdup_printf("%s%s=%.3fV\n",
+		sensors = h_strdup_cprintf("%s=%.3fV\n",
 					  sensors, name,
 					  adjust_sensor(mon,
 							atof(tmp) /
@@ -268,7 +267,7 @@ static void read_sensors_acpi(void)
 
 		    sscanf(contents, "temperature: %d C", &temperature);
 
-		    temp = g_strdup_printf("%s\n%s=%d\302\260C\n",
+		    temp = h_strdup_cprintf("\n%s=%d\302\260C\n",
 					      temp, entry, temperature);
 
 		    g_free(contents);
@@ -277,7 +276,7 @@ static void read_sensors_acpi(void)
 
 	    if (*temp != '\0')
     	        sensors =
-	    	    g_strdup_printf("%s\n[ACPI Thermal Zone]\n%s",
+	    	    h_strdup_cprintf("\n[ACPI Thermal Zone]\n%s",
 	    	                    sensors, temp);
 
 	    g_dir_close(tz);
@@ -296,7 +295,7 @@ static void read_sensors_omnibook(void)
 
         sscanf(contents, "CPU temperature: %d C", &temperature);
 
-        sensors = g_strdup_printf("%s\n[Omnibook]\n"
+        sensors = h_strdup_cprintf("\n[Omnibook]\n"
                                   "CPU temperature=%d\302\260C\n",
                                   sensors, temperature);
 
@@ -335,8 +334,7 @@ static void read_sensors_hddtemp(void)
 		 * 2 -> 41
 		 * 3 -> C
 		 */
-		old = g_strdup_printf("%s\n"
-				      "%s (%s)=%s\302\260%s\n",
+		old = h_strdup_cprintf("\n%s (%s)=%s\302\260%s\n",
 				      old,
 				      fields[1], fields[0],
 				      fields[2], fields[3]);
diff --git a/hardinfo2/arch/linux/common/storage.h b/hardinfo2/arch/linux/common/storage.h
index 03081e2f..6700984b 100644
--- a/hardinfo2/arch/linux/common/storage.h
+++ b/hardinfo2/arch/linux/common/storage.h
@@ -16,7 +16,7 @@
  *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-static gchar *storage_icons = "";
+static gchar *storage_icons = NULL;
 
 static gboolean
 remove_scsi_devices(gpointer key, gpointer value, gpointer data)
@@ -110,8 +110,8 @@ __scan_scsi_devices(void)
 	    }
 	    
 	    gchar *devid = g_strdup_printf("SCSI%d", n);
-	    storage_list = g_strdup_printf("%s$%s$%s=\n", storage_list, devid, model);
-	    storage_icons = g_strdup_printf("%sIcon$%s$%s=%s.png\n", storage_icons, devid, model, icon);
+	    storage_list = h_strdup_cprintf("$%s$%s=\n", storage_list, devid, model);
+	    storage_icons = h_strdup_cprintf("Icon$%s$%s=%s.png\n", storage_icons, devid, model, icon);
 
 	    gchar *strhash = g_strdup_printf("[Device Information]\n"
 					     "Model=%s\n"
@@ -159,7 +159,7 @@ __scan_ide_devices(void)
     /* remove old devices from global device table */
     g_hash_table_foreach_remove(moreinfo, remove_ide_devices, NULL);
 
-    storage_list = g_strdup_printf("%s\n[IDE Disks]\n", storage_list);
+    storage_list = g_strconcat(storage_list, "\n[IDE Disks]\n", NULL);
 
     iface = 'a';
     for (i = 0; i <= 16; i++) {
@@ -205,26 +205,26 @@ __scan_ide_devices(void)
       	                       gchar *media_type = g_strstrip(strstr(buf, "Does "));
       	                       gchar **ttmp = g_strsplit(media_type, " ", 0);
   	                   
-      	                       capab = g_strdup_printf("%s\nCan %s#%d=%s\n",
-  	                                               capab ? capab : "",
+      	                       capab = h_strdup_cprintf("\nCan %s#%d=%s\n",
+  	                                               capab,
   	                                               ttmp[1], ++nn, ttmp[2]);
   	                                           
                                g_strfreev(ttmp);
                            } else if (strstr(buf, "Buffer-Underrun-Free")) {
-                               capab = g_strdup_printf("%s\nSupports BurnProof=%s\n",
-                                                       capab ? capab : "",
+                               capab = h_strdup_cprintf("\nSupports BurnProof=%s\n",
+                                                       capab,
                                                        strstr(buf, "Does not") ? "No" : "Yes");
                            } else if (strstr(buf, "multi-session")) {
-                               capab = g_strdup_printf("%s\nCan read multi-session CDs=%s\n",
-                                                       capab ? capab : "",
+                               capab = h_strdup_cprintf("\nCan read multi-session CDs=%s\n",
+                                                       capab,
                                                        strstr(buf, "Does not") ? "No" : "Yes");
                            } else if (strstr(buf, "audio CDs")) {
-                               capab = g_strdup_printf("%s\nCan play audio CDs=%s\n",
-                                                       capab ? capab : "",
+                               capab = h_strdup_cprintf("\nCan play audio CDs=%s\n",
+                                                       capab,
                                                        strstr(buf, "Does not") ? "No" : "Yes");
                            } else if (strstr(buf, "PREVENT/ALLOW")) {
-                               capab = g_strdup_printf("%s\nCan lock media=%s\n",
-                                                       capab ? capab : "",
+                               capab = h_strdup_cprintf("\nCan lock media=%s\n",
+                                                       capab,
                                                        strstr(buf, "Does not") ? "No" : "Yes");
                            }
   	               } else if ((strstr(buf, "read") || strstr(buf, "write")) && strstr(buf, "kB/s")) {
@@ -242,7 +242,6 @@ __scan_ide_devices(void)
 	        
 	        g_free(tmp);
 	    }
-
 	    g_free(device);
 
 	    device = g_strdup_printf("/proc/ide/hd%c/cache", iface);
@@ -282,9 +281,9 @@ __scan_ide_devices(void)
 
 	    gchar *devid = g_strdup_printf("IDE%d", n);
 
-	    storage_list = g_strdup_printf("%s$%s$%s=\n", storage_list,
+	    storage_list = h_strdup_cprintf("$%s$%s=\n", storage_list,
 					 devid, model);
-	    storage_icons = g_strdup_printf("%sIcon$%s$%s=%s.png\n", storage_icons, devid,
+	    storage_icons = h_strdup_cprintf("Icon$%s$%s=%s.png\n", storage_icons, devid,
 	                                  model, g_str_equal(media, "cdrom") ? \
 	                                         "cdrom" : "hdd");
 
@@ -301,14 +300,14 @@ __scan_ide_devices(void)
 					     media,
 					     cache);
             if (driver) {
-                strhash = g_strdup_printf("%s%s\n", strhash, driver);
+                strhash = h_strdup_cprintf("%s\n", strhash, driver);
                 
                 g_free(driver);
                 driver = NULL;
             }
             
 	    if (pgeometry && lgeometry) {
-		strhash = g_strdup_printf("%s[Geometry]\n"
+		strhash = h_strdup_cprintf("[Geometry]\n"
 					  "Physical=%s\n"
 					  "Logical=%s\n",
 					  strhash, pgeometry, lgeometry);
@@ -320,14 +319,14 @@ __scan_ide_devices(void)
             }
             
             if (capab) {
-                strhash = g_strdup_printf("%s[Capabilities]\n%s", strhash, capab);
+                strhash = h_strdup_cprintf("[Capabilities]\n%s", strhash, capab);
                 
                 g_free(capab);
                 capab = NULL;
             }
             
             if (speed) {
-                strhash = g_strdup_printf("%s[Speeds]\n%s", strhash, speed);
+                strhash = h_strdup_cprintf("[Speeds]\n%s", strhash, speed);
                 
                 g_free(speed);
                 speed = NULL;
diff --git a/hardinfo2/arch/linux/common/usb.h b/hardinfo2/arch/linux/common/usb.h
index 59f6785c..f2592648 100644
--- a/hardinfo2/arch/linux/common/usb.h
+++ b/hardinfo2/arch/linux/common/usb.h
@@ -86,10 +86,10 @@ __scan_usb(void)
 	    
 
 	    if (classid == 9) {	/* hub */
-    	        usb_list = g_strdup_printf("%s[%s#%d]\n",
+    	        usb_list = h_strdup_cprintf("[%s#%d]\n",
 		      		           usb_list, product, n);
             } else { /* everything else */
-    	        usb_list = g_strdup_printf("%s$%s$%s=\n",
+    	        usb_list = h_strdup_cprintf("$%s$%s=\n",
 		      		           usb_list, tmp, product);
 
                 const gchar *url = vendor_get_url(manuf);