Cleanups. Plug most of the memleaks.

4 files changed, 13 insertions, 15 deletions

diff --git a/hardinfo2/arch/common/display.h b/hardinfo2/arch/common/display.h
index b4fe643e..00636d9e 100644
--- a/hardinfo2/arch/common/display.h
+++ b/hardinfo2/arch/common/display.h
@@ -108,14 +108,14 @@ get_x11_info(DisplayInfo *di)
         gint n_monitors = gdk_screen_get_n_monitors(screen);
         gint i;
         
-        di->monitors = "";
+        di->monitors = NULL;
         for (i = 0; i < n_monitors; i++) {
             GdkRectangle rect;
             
             gdk_screen_get_monitor_geometry(screen, i, &rect);
             
-            di->monitors = g_strdup_printf("%sMonitor %d=%dx%d pixels\n",
-                                           di->monitors, i, rect.width, rect.height);
+            di->monitors = h_strdup_cprintf("Monitor %d=%dx%d pixels\n",
+                                            di->monitors, i, rect.width, rect.height);
         }
       } else {
           di->monitors = "";
diff --git a/hardinfo2/arch/common/languages.h b/hardinfo2/arch/common/languages.h
index 786b829f..efc100fb 100644
--- a/hardinfo2/arch/common/languages.h
+++ b/hardinfo2/arch/common/languages.h
@@ -20,7 +20,7 @@ void
 scan_languages(OperatingSystem * os)
 {
     FILE *locale;
-    gchar buf[512], *retval = "";
+    gchar buf[512], *retval = NULL;
 
     locale = popen("locale -va", "r");
     if (!locale)
@@ -64,7 +64,7 @@ scan_languages(OperatingSystem * os)
 	} else {
 	    gchar *currlocale;
 
-	    retval = g_strdup_printf("%s$%s$%s=%s\n", retval, name, name, title);
+	    retval = h_strdup_cprintf("$%s$%s=%s\n", retval, name, name, title);
 
 #define FIELD(f) f ? f : "(Unknown)"
 	    currlocale = g_strdup_printf("[Locale Information]\n"
diff --git a/hardinfo2/arch/common/printers.h b/hardinfo2/arch/common/printers.h
index fad80f25..43ddda0a 100644
--- a/hardinfo2/arch/common/printers.h
+++ b/hardinfo2/arch/common/printers.h
@@ -70,14 +70,12 @@ __scan_printers(void)
     if (noprinters > 0) {
 	printer_list = g_strdup_printf("[Printers (CUPS)]\n");
 	for (i = 0; i < noprinters; i++) {
-	    printer_list = g_strdup_printf("%s\n"
-					   "$PRN%d$" 
-                                           "%s=%s\n",
-					   printer_list,
-					   i,						
-					   printers[i],
-                                           g_str_equal(default_printer, printers[i]) ?
-				           "<i>(Default)</i>" : "");
+	    printer_list = h_strdup_cprintf("\n$PRN%d$%s=%s\n",
+					    printer_list,
+					    i,						
+					    printers[i],
+                                            g_str_equal(default_printer, printers[i]) ?
+				            "<i>(Default)</i>" : "");
 	    g_free(printers[i]);
 	}
 	
diff --git a/hardinfo2/arch/common/users.h b/hardinfo2/arch/common/users.h
index 5889dc0a..fd8f7834 100644
--- a/hardinfo2/arch/common/users.h
+++ b/hardinfo2/arch/common/users.h
@@ -45,9 +45,9 @@ scan_users_do(void)
       uid = atoi(tmp[2]);
       strend(tmp[4], ',');
       if (uid >= 1000 && uid <= 65530) {
-        human_users = g_strdup_printf("%s$%s$%s=%s\n", human_users, key, tmp[0], tmp[4]);
+        human_users = h_strdup_cprintf("$%s$%s=%s\n", human_users, key, tmp[0], tmp[4]);
       } else {
-        sys_users = g_strdup_printf("%s$%s$%s=%s\n", sys_users, key, tmp[0], tmp[4]);
+        sys_users = h_strdup_cprintf("$%s$%s=%s\n", sys_users, key, tmp[0], tmp[4]);
       }      
       
       g_strfreev(tmp);