From: Pali Rohár <pali.rohar@gmail.com>
Date: Mon, 12 Jul 2021 22:40:00 +0000 (+0200)
Subject: fdisk: move reorder diag messages to fdisk_reorder_partitions()
X-Git-Tag: v2.38-rc1~373^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f05a5bb2c2e62d3753f8c9262b9f6cbf469e5b0e;p=thirdparty%2Futil-linux.git

fdisk: move reorder diag messages to fdisk_reorder_partitions()

The function fdisk_reorder_partitions() is also used in sfdisk and cfdisk
and these commands assume info/warn messages from the library. So move all
messages from fdisk to fdisk_reorder_partitions().

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
---

diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c
index 42bffb5587..dcd9e796ca 100644
--- a/disk-utils/fdisk-menu.c
+++ b/disk-utils/fdisk-menu.c
@@ -636,17 +636,6 @@ static int generic_menu_cb(struct fdisk_context **cxt0,
 			break;
 		case 'f':
 			rc = fdisk_reorder_partitions(cxt);
-			switch (rc) {
-			default:
-				fdisk_warnx(cxt, _("Failed to fix partitions order."));
-				break;
-			case 0:
-				fdisk_info(cxt, _("Partitions order fixed."));
-				break;
-			case 1:
-				fdisk_info(cxt, _("Nothing to do. Ordering is correct already."));
-				break;
-			}
 			break;
 		case 'r':
 			rc = fdisk_enable_details(cxt, 0);
diff --git a/libfdisk/src/label.c b/libfdisk/src/label.c
index 524a2bfb4a..dc0ad9b04f 100644
--- a/libfdisk/src/label.c
+++ b/libfdisk/src/label.c
@@ -583,12 +583,28 @@ int fdisk_toggle_partition_flag(struct fdisk_context *cxt,
  */
 int fdisk_reorder_partitions(struct fdisk_context *cxt)
 {
+	int rc;
+
 	if (!cxt || !cxt->label)
 		return -EINVAL;
 	if (!cxt->label->op->reorder)
 		return -ENOSYS;
 
-	return cxt->label->op->reorder(cxt);
+	rc = cxt->label->op->reorder(cxt);
+
+	switch (rc) {
+	case 0:
+		fdisk_info(cxt, _("Partitions order fixed."));
+		break;
+	case 1:
+		fdisk_info(cxt, _("Nothing to do. Ordering is correct already."));
+		break;
+	default:
+		fdisk_warnx(cxt, _("Failed to fix partitions order."));
+		break;
+	}
+
+	return rc;
 }
 
 /*