From: Karel Zak <kzak@redhat.com>
Date: Mon, 10 Jun 2013 09:48:16 +0000 (+0200)
Subject: partx: use TT_FL_FREEDATA for tt table
X-Git-Tag: v2.24-rc1~205
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6df8dcfb391a82381c8bb8ad92493bba10c7e498;p=thirdparty%2Futil-linux.git

partx: use TT_FL_FREEDATA for tt table

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/disk-utils/partx.c b/disk-utils/partx.c
index b93ddf3efe..c4b1d73ea0 100644
--- a/disk-utils/partx.c
+++ b/disk-utils/partx.c
@@ -571,19 +571,14 @@ static void add_tt_line(struct tt *tt, blkid_partition par)
 					blkid_partition_get_size(par) << 9);
 			break;
 		case COL_NAME:
-			str = (char *) blkid_partition_get_name(par);
-			if (str)
-				str = xstrdup(str);
+			str = xstrdup(blkid_partition_get_name(par));
 			break;
 		case COL_UUID:
-			str = (char *) blkid_partition_get_uuid(par);
-			if (str)
-				str = xstrdup(str);
+			str = xstrdup(blkid_partition_get_uuid(par));
 			break;
 		case COL_TYPE:
-			str = (char *) blkid_partition_get_type_string(par);
-			if (str)
-				str = xstrdup(str);
+			if (blkid_partition_get_type_string(par))
+				str = xstrdup(blkid_partition_get_type_string(par));
 			else
 				xasprintf(&str, "0x%x",
 					blkid_partition_get_type(par));
@@ -594,11 +589,8 @@ static void add_tt_line(struct tt *tt, blkid_partition par)
 		case COL_SCHEME:
 		{
 			blkid_parttable tab = blkid_partition_get_table(par);
-			if (tab) {
-				str = (char *) blkid_parttable_get_type(tab);
-				if (str)
-					str = xstrdup(str);
-			}
+			if (tab)
+				str = xstrdup(blkid_parttable_get_type(tab));
 			break;
 		}
 		default:
@@ -622,7 +614,7 @@ static int show_parts(blkid_partlist ls, int tt_flags, int lower, int upper)
 	if (!nparts)
 		return 0;
 
-	tt = tt_new_table(tt_flags);
+	tt = tt_new_table(tt_flags | TT_FL_FREEDATA);
 	if (!tt) {
 		warn(_("failed to initialize output table"));
 		return -1;