[Parted-commits] GNU Parted Official Repository: Changes to 'master'

[Jim Meyering]

 parted/table.c |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 95359ad0c816ea476adda38b81e72c94257c531d
Author: Jim Meyering <jim at meyering.net>
Date:   Fri May 25 19:40:56 2007 +0200

    Use xmalloc and xrealloc, rather than unchecked malloc and realloc.
    * parted/table.c: Use gnulib's xmalloc and realloc.
    Remove anachronistic casts of malloc/realloc return value.
    Change "sizeof(type)" to safer "sizeof(*var)" (one of the former
    was wrong, but in a harmless way).

diff --git a/parted/table.c b/parted/table.c
index 8768a92..23976a9 100644
--- a/parted/table.c
+++ b/parted/table.c
@@ -68,7 +68,7 @@ Table* table_new(int ncols)
 {
         assert ( ncols >= 0 );
         
-        Table *t = malloc(sizeof(Table));
+        Table *t = xmalloc (sizeof(*t));
 
         t->ncols = ncols;
         t->nrows = 0;
@@ -117,7 +117,7 @@ static void table_calc_column_widths (Table* t)
         assert(t->ncols > 0);
         
         if (!t->widths)
-                t->widths = (int*)malloc(t->ncols * sizeof(int));
+                t->widths = xmalloc (t->ncols * sizeof(t->widths[0]));
 
         for (c = 0; c < t->ncols; ++c)
                 t->widths[c] = 0;
@@ -147,8 +147,7 @@ void table_add_row (Table* t, wchar_t** row)
                 printf("[%s]", row[i]);
         putchar ('\n');*/
 
-        t->rows = (wchar_t***)realloc (t->rows, (t->nrows + 1)
-                                                * sizeof(wchar_t***));
+        t->rows = xrealloc (t->rows, (t->nrows + 1) * sizeof(wchar_t***));
          
         t->rows[t->nrows] = row;
 
@@ -160,8 +159,7 @@ void table_add_row (Table* t, wchar_t** row)
 
 void table_add_row_from_strlist (Table* t, StrList* list)
 {
-        wchar_t** row = (wchar_t**)malloc(str_list_length(list)
-                                          * sizeof(wchar_t**));
+        wchar_t** row = xmalloc (str_list_length(list) * sizeof(*row));
         int i = 0;
 
         while (list)
@@ -199,7 +197,7 @@ static void table_render_row (Table* t, int rownum, int ncols, wchar_t** s)
                 int j;
                 int nspaces = max(t->widths[i] - wcswidth(row[i], MAX_WIDTH),
                                   0);
-                wchar_t* pad = xmalloc ((nspaces + 1) * sizeof(wchar_t));
+                wchar_t* pad = xmalloc ((nspaces + 1) * sizeof(*pad));
 
                 for (j = 0; j < nspaces; ++j)
                        pad[j] = L' '; 
@@ -238,7 +236,7 @@ static void table_render_rows (Table* t, wchar_t** s)
  */
 wchar_t* table_render(Table* t)
 {
-        wchar_t* s = malloc(sizeof(wchar_t));
+        wchar_t* s = xmalloc (sizeof(*s));
 
         *s = L_('\0');
         table_render_rows (t, &s);