# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1136671302 -3600
# Node ID 056dc9e65c25b4508421668da507b8d0e46db8d3
# Parent  29a0637c176fd27a8b435ebb70dea6ee38be499f
Some memory allocation code cleaning


diff -r 29a0637c176f -r 056dc9e65c25 mcabber/src/screen.c
--- a/mcabber/src/screen.c	Sat Jan 07 22:42:08 2006 +0100
+++ b/mcabber/src/screen.c	Sat Jan 07 23:01:42 2006 +0100
@@ -162,7 +162,7 @@
     NULL
   };
 
-  char *tmp = malloc(1024);
+  char *tmp = g_new(char, 512);
   const char *color;
   const char *background   = settings_opt_get("color_background");
   const char *backselected = settings_opt_get("color_backselected");
@@ -173,7 +173,7 @@
   if (!backselected) backselected = "cyan";
 
   while (colors[i]) {
-    sprintf(tmp, "color_%s", colors[i]);
+    snprintf(tmp, 512, "color_%s", colors[i]);
     color = settings_opt_get(tmp);
 
     switch (i + 1) {
@@ -272,7 +272,7 @@
     }
   }
   if (flag & (LPRINT_LOG|LPRINT_DEBUG)) {
-    char *buffer2 = g_new(char, 5184);
+    char *buffer2 = g_try_new(char, 5184);
 
     if (buffer2) {
       strftime(buffer2, 23, "[%Y-%m-%d %H:%M:%S] ", localtime(&timestamp));
@@ -284,7 +284,7 @@
     strcat(buffer2, "\n");
     ut_WriteLog(flag, buffer2);
     if (buffer2 != buffer)
-      free(buffer2);
+      g_free(buffer2);
   }
   g_free(buffer);
 }
@@ -297,9 +297,7 @@
   int cols;
   window_entry_t *tmp;
 
-  do {
-    tmp = calloc(1, sizeof(window_entry_t));
-  } while (!tmp);
+  tmp = g_new0(window_entry_t, 1);
 
   // Dimensions
   x = ROSTER_WIDTH;
@@ -314,8 +312,7 @@
   }
   wbkgd(tmp->win, COLOR_PAIR(COLOR_GENERAL));
   tmp->panel = new_panel(tmp->win);
-  tmp->name = (char *) calloc(1, 96);
-  strncpy(tmp->name, title, 96);
+  tmp->name = g_strdup(title);
 
   if (!dont_show) {
     currentWindow = tmp;