Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/screen.c @ 657:056dc9e65c25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some memory allocation code cleaning
author Mikael Berthe <mikael@lilotux.net>
date Sat, 07 Jan 2006 23:01:42 +0100
parents d7fe7b88e4fc
children 5d71d1f8887e
comparison
equal deleted inserted replaced
656:29a0637c176f 657:056dc9e65c25
160 "rosterselect", 160 "rosterselect",
161 "rosternormal", 161 "rosternormal",
162 NULL 162 NULL
163 }; 163 };
164 164
165 char *tmp = malloc(1024); 165 char *tmp = g_new(char, 512);
166 const char *color; 166 const char *color;
167 const char *background = settings_opt_get("color_background"); 167 const char *background = settings_opt_get("color_background");
168 const char *backselected = settings_opt_get("color_backselected"); 168 const char *backselected = settings_opt_get("color_backselected");
169 int i = 0; 169 int i = 0;
170 170
171 // Default values 171 // Default values
172 if (!background) background = "blue"; 172 if (!background) background = "blue";
173 if (!backselected) backselected = "cyan"; 173 if (!backselected) backselected = "cyan";
174 174
175 while (colors[i]) { 175 while (colors[i]) {
176 sprintf(tmp, "color_%s", colors[i]); 176 snprintf(tmp, 512, "color_%s", colors[i]);
177 color = settings_opt_get(tmp); 177 color = settings_opt_get(tmp);
178 178
179 switch (i + 1) { 179 switch (i + 1) {
180 case 1: 180 case 1:
181 init_pair(1, COLOR_BLACK, COLOR_WHITE); 181 init_pair(1, COLOR_BLACK, COLOR_WHITE);
270 } else { 270 } else {
271 printf("%s\n", buffer); 271 printf("%s\n", buffer);
272 } 272 }
273 } 273 }
274 if (flag & (LPRINT_LOG|LPRINT_DEBUG)) { 274 if (flag & (LPRINT_LOG|LPRINT_DEBUG)) {
275 char *buffer2 = g_new(char, 5184); 275 char *buffer2 = g_try_new(char, 5184);
276 276
277 if (buffer2) { 277 if (buffer2) {
278 strftime(buffer2, 23, "[%Y-%m-%d %H:%M:%S] ", localtime(&timestamp)); 278 strftime(buffer2, 23, "[%Y-%m-%d %H:%M:%S] ", localtime(&timestamp));
279 strcat(buffer2, b2); 279 strcat(buffer2, b2);
280 } else { 280 } else {
282 } 282 }
283 283
284 strcat(buffer2, "\n"); 284 strcat(buffer2, "\n");
285 ut_WriteLog(flag, buffer2); 285 ut_WriteLog(flag, buffer2);
286 if (buffer2 != buffer) 286 if (buffer2 != buffer)
287 free(buffer2); 287 g_free(buffer2);
288 } 288 }
289 g_free(buffer); 289 g_free(buffer);
290 } 290 }
291 291
292 static window_entry_t *scr_CreateBuddyPanel(const char *title, int dont_show) 292 static window_entry_t *scr_CreateBuddyPanel(const char *title, int dont_show)
295 int y; 295 int y;
296 int lines; 296 int lines;
297 int cols; 297 int cols;
298 window_entry_t *tmp; 298 window_entry_t *tmp;
299 299
300 do { 300 tmp = g_new0(window_entry_t, 1);
301 tmp = calloc(1, sizeof(window_entry_t));
302 } while (!tmp);
303 301
304 // Dimensions 302 // Dimensions
305 x = ROSTER_WIDTH; 303 x = ROSTER_WIDTH;
306 y = 0; 304 y = 0;
307 lines = CHAT_WIN_HEIGHT; 305 lines = CHAT_WIN_HEIGHT;
312 safe_usleep(250); 310 safe_usleep(250);
313 tmp->win = newwin(lines, cols, y, x); 311 tmp->win = newwin(lines, cols, y, x);
314 } 312 }
315 wbkgd(tmp->win, COLOR_PAIR(COLOR_GENERAL)); 313 wbkgd(tmp->win, COLOR_PAIR(COLOR_GENERAL));
316 tmp->panel = new_panel(tmp->win); 314 tmp->panel = new_panel(tmp->win);
317 tmp->name = (char *) calloc(1, 96); 315 tmp->name = g_strdup(title);
318 strncpy(tmp->name, title, 96);
319 316
320 if (!dont_show) { 317 if (!dont_show) {
321 currentWindow = tmp; 318 currentWindow = tmp;
322 } else { 319 } else {
323 if (currentWindow) 320 if (currentWindow)