From: Karel Zak <kzak@redhat.com>
Date: Tue, 25 Jun 2013 14:22:51 +0000 (+0200)
Subject: fdisk: (dos) cleanup public function names
X-Git-Tag: v2.24-rc1~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8ad38998695da18497a0452a1fe603c973c706e;p=thirdparty%2Futil-linux.git

fdisk: (dos) cleanup public function names

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

diff --git a/fdisks/fdisk-menu.c b/fdisks/fdisk-menu.c
index ae6dda8bd6..4096fed8ac 100644
--- a/fdisks/fdisk-menu.c
+++ b/fdisks/fdisk-menu.c
@@ -458,14 +458,14 @@ static int dos_menu_cb(struct fdisk_context *cxt,
 		size_t n;
 		rc = fdisk_ask_partnum(cxt, &n, FALSE);
 		if (!rc)
-			dos_move_begin(cxt, n);
+			rc = fdisk_dos_move_begin(cxt, n);
 		break;
 	}
 	case 'e':
 		rc = fdisk_dos_list_extended(cxt);
 		break;
 	case 'f':
-		dos_fix_partition_table_order(cxt);
+		rc = fdisk_dos_fix_order(cxt);
 		break;
 	case 'i':
 		rc = fdisk_set_disklabel_id(cxt);
diff --git a/fdisks/fdiskdoslabel.c b/fdisks/fdiskdoslabel.c
index 37d27e2c99..f17eb1ef78 100644
--- a/fdisks/fdiskdoslabel.c
+++ b/fdisks/fdiskdoslabel.c
@@ -16,7 +16,6 @@
 #include "fdiskdoslabel.h"
 
 #define MAXIMUM_PARTS	60
-
 #define ACTIVE_FLAG     0x80
 
 #define IS_EXTENDED(i) \
@@ -1684,14 +1683,14 @@ static void fix_chain_of_logicals(struct fdisk_context *cxt)
 		l->ptes[j].changed = 1;
 }
 
-void dos_fix_partition_table_order(struct fdisk_context *cxt)
+int fdisk_dos_fix_order(struct fdisk_context *cxt)
 {
 	struct pte *pei, *pek;
 	size_t i,k;
 
 	if (!wrong_p_order(cxt, NULL)) {
 		fdisk_info(cxt, _("Nothing to do. Ordering is correct already."));
-		return;
+		return 0;
 	}
 
 	while ((i = wrong_p_order(cxt, &k)) != 0 && i < 4) {
@@ -1720,23 +1719,27 @@ void dos_fix_partition_table_order(struct fdisk_context *cxt)
 		fix_chain_of_logicals(cxt);
 
 	fdisk_info(cxt, _("Done."));
-
+	return 0;
 }
 
-void dos_move_begin(struct fdisk_context *cxt, int i)
+int fdisk_dos_move_begin(struct fdisk_context *cxt, int i)
 {
-	struct pte *pe = self_pte(cxt, i);
-	struct dos_partition *p = pe->pt_entry;
+	struct pte *pe;
+	struct dos_partition *p;
 	unsigned int new, free_start, curr_start, last;
 	uintmax_t res = 0;
 	size_t x;
+	int rc;
 
 	assert(cxt);
 	assert(fdisk_is_disklabel(cxt, DOS));
 
+	pe = self_pte(cxt, i);
+	p = pe->pt_entry;
+
 	if (!p->sys_ind || !dos_partition_get_size(p) || IS_EXTENDED (p->sys_ind)) {
 		fdisk_warn(cxt, _("Partition %d: no data area."), i + 1);
-		return;
+		return 0;
 	}
 
 	/* the default start is at the second sector of the disk or at the
@@ -1764,9 +1767,11 @@ void dos_move_begin(struct fdisk_context *cxt, int i)
 
 	last = get_abs_partition_start(pe) + dos_partition_get_size(p) - 1;
 
-	if (fdisk_ask_number(cxt, free_start, curr_start, last,
-			_("New beginning of data"), &res))
-		return;
+	rc = fdisk_ask_number(cxt, free_start, curr_start, last,
+			_("New beginning of data"), &res);
+	if (rc)
+		return rc;
+
 	new = res - pe->offset;
 
 	if (new != dos_partition_get_size(p)) {
@@ -1778,6 +1783,8 @@ void dos_move_begin(struct fdisk_context *cxt, int i)
 
 		partition_set_changed(cxt, i, 1);
 	}
+
+	return rc;
 }
 
 static int dos_get_partition_status(
diff --git a/fdisks/fdiskdoslabel.h b/fdisks/fdiskdoslabel.h
index 05ee0a202e..53fa58b1ec 100644
--- a/fdisks/fdiskdoslabel.h
+++ b/fdisks/fdiskdoslabel.h
@@ -5,10 +5,8 @@ extern struct dos_partition *fdisk_dos_get_partition(
 				struct fdisk_context *cxt,
 				size_t i);
 
-extern void dos_fix_partition_table_order(struct fdisk_context *cxt);
-extern void dos_move_begin(struct fdisk_context *cxt, int i);
-extern void dos_toggle_active(struct fdisk_context *cxt, int i);
-
+extern int fdisk_dos_fix_order(struct fdisk_context *cxt);
+extern int fdisk_dos_move_begin(struct fdisk_context *cxt, int i);
 extern int fdisk_dos_list_extended(struct fdisk_context *cxt);
 
 /* toggle flags */