[ViewVC] Diff of: cvs/rxvt-unicode/src/screen.C

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.421 by sf-exg, Sun Jun 10 13:07:56 2012 UTC vs.
Revision 1.423 by sf-exg, Fri Jun 29 14:01:53 2012 UTC

   tsize -= tsize % sizeof (rend_t);
   int all_rows = total_rows + nrow + nrow;
   chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
-  chunk = rxvt_malloc (chunk_size);
+  chunk = chunk_alloc (chunk_size, 0);
   char *base = (char *)chunk + sizeof (line_t) * all_rows;
   for (int row = 0; row < all_rows; ++row)
     {
   screen.tscroll = 0;
   screen.bscroll = nrow - 1;
   void *prev_chunk = chunk;
+  size_t prev_chunk_size = chunk_size;
   line_t *prev_drawn_buf = drawn_buf;
   line_t *prev_swap_buf  = swap_buf;
   line_t *prev_row_buf   = row_buf;
   int common_col = min (prev_ncol, ncol);
       if (!ROW       (row).valid ()) scr_blank_screen_mem (ROW       (row), DEFAULT_RSTYLE);
       if (!swap_buf  [row].valid ()) scr_blank_screen_mem (swap_buf  [row], DEFAULT_RSTYLE);
       if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
     }
-  free (prev_chunk);
+  chunk_free (prev_chunk, prev_chunk_size);
   free (tabs);
   tabs = (char *)rxvt_malloc (ncol);
   for (int col = ncol; col--; )
 }
 void ecb_cold
 rxvt_term::scr_release () NOTHROW
 {
-  free (chunk); chunk = 0; row_buf = 0;
+  chunk_free (chunk, chunk_size);
-  free (tabs);  tabs  = 0;
+  chunk = 0;
+  row_buf = 0;
+  free (tabs);
+  tabs = 0;
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Hard/Soft reset

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines