From: Karel Zak <kzak@redhat.com>
Date: Tue, 22 Aug 2017 12:53:18 +0000 (+0200)
Subject: libfdisk: improve "add partition" debug message
X-Git-Tag: v2.31-rc1~123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1573e9551448050de2e42b254909f3c7554c25fd;p=thirdparty%2Futil-linux.git

libfdisk: improve "add partition" debug message

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

diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c
index 93e6d9a491..3a34c4fdae 100644
--- a/libfdisk/src/partition.c
+++ b/libfdisk/src/partition.c
@@ -1408,12 +1408,15 @@ int fdisk_add_partition(struct fdisk_context *cxt,
 
 	if (pa) {
 		pa->fs_probed = 0;
-		DBG(CXT, ul_debugobj(cxt, "adding new partition %p (start=%ju, end=%ju, size=%ju, "
-			    "defaults(start=%s, end=%s, partno=%s)",
-			    pa,
-			    (uintmax_t) fdisk_partition_get_start(pa),
-			    (uintmax_t) fdisk_partition_get_end(pa),
-			    (uintmax_t) fdisk_partition_get_size(pa),
+		DBG(CXT, ul_debugobj(cxt, "adding new partition %p", pa));
+		if (fdisk_partition_has_start(pa))
+			DBG(CXT, ul_debugobj(cxt, "     start: %ju", (uintmax_t) fdisk_partition_get_start(pa)));
+		if (fdisk_partition_has_end(pa))
+			DBG(CXT, ul_debugobj(cxt, "       end: %ju", (uintmax_t) fdisk_partition_get_end(pa)));
+		if (fdisk_partition_has_size(pa))
+			DBG(CXT, ul_debugobj(cxt, "      size: %ju", (uintmax_t) fdisk_partition_get_size(pa)));
+
+		DBG(CXT, ul_debugobj(cxt,         "  defaults: start=%s, end=%s, partno=%s",
 			    pa->start_follow_default ? "yes" : "no",
 			    pa->end_follow_default ? "yes" : "no",
 			    pa->partno_follow_default ? "yes" : "no"));