parted/parted-1.8.6-notransname.patch

40 lines
1.5 KiB
Diff

--- parted-1.8.6/parted/parted.c.notransname 2007-03-13 13:01:09.000000000 -0400
+++ parted-1.8.6/parted/parted.c 2007-03-21 10:50:35.000000000 -0400
@@ -1429,7 +1429,7 @@
part->fs_type->name : "");
if (has_name) {
- name = _(ped_partition_get_name (part));
+ name = ped_partition_get_name (part);
str_list_append (row, name);
}
--- parted-1.8.6/parted/table.c.notransname 2007-03-13 13:01:09.000000000 -0400
+++ parted-1.8.6/parted/table.c 2007-03-21 10:51:31.000000000 -0400
@@ -191,7 +191,8 @@
len += wcslen(COLSUFFIX);
newsize = (wcslen(*s) + len + 1) * sizeof(wchar_t);
- *s = realloc (*s, newsize);
+ *s = (wchar_t *) realloc (*s, newsize);
+ assert(*s != NULL);
for (i = 0; i < ncols; ++i)
{
@@ -199,6 +200,7 @@
int nspaces = max(t->widths[i] - wcswidth(row[i], MAX_WIDTH),
0);
wchar_t* pad = malloc ( (nspaces + 1) * sizeof(wchar_t) );
+ assert(pad != NULL);
for (j = 0; j < nspaces; ++j)
pad[j] = L' ';
@@ -211,6 +213,7 @@
wcscat (*s, DELIMITER);
free (pad);
+ pad = NULL;
}
wcscat (*s, COLSUFFIX);