From: Karel Zak <kzak@redhat.com>
Date: Mon, 21 Jan 2013 11:28:27 +0000 (+0100)
Subject: fdisk: (dos) move dos specific code
X-Git-Tag: v2.23-rc1~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc0c4e56aa0afe2fbeb02c96d754e4542ea807da;p=thirdparty%2Futil-linux.git

fdisk: (dos) move dos specific code

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

diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index d7a7d0050a..18990f72ad 100644
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -745,24 +745,6 @@ static void list_table(struct fdisk_context *cxt, int xtra)
 		dos_list_table(cxt, xtra);
 }
 
-void fill_bounds(sector_t *first, sector_t *last)
-{
-	int i;
-	struct pte *pe = &ptes[0];
-	struct partition *p;
-
-	for (i = 0; i < partitions; pe++,i++) {
-		p = pe->part_table;
-		if (!p->sys_ind || IS_EXTENDED (p->sys_ind)) {
-			first[i] = 0xffffffff;
-			last[i] = 0;
-		} else {
-			first[i] = get_partition_start(pe);
-			last[i] = first[i] + get_nr_sects(p) - 1;
-		}
-	}
-}
-
 static void verify(struct fdisk_context *cxt)
 {
 	if (warn_geometry(cxt))
diff --git a/fdisks/fdisk.h b/fdisks/fdisk.h
index 9b85b6484e..54f91a1ae0 100644
--- a/fdisks/fdisk.h
+++ b/fdisks/fdisk.h
@@ -79,8 +79,6 @@ extern unsigned int read_int(struct fdisk_context *cxt,
 extern void print_menu(struct fdisk_context *cxt, enum menutype menu);
 extern void print_partition_size(struct fdisk_context *cxt, int num, sector_t start, sector_t stop, int sysid);
 
-extern void fill_bounds(sector_t *first, sector_t *last);
-
 extern char *partition_type(struct fdisk_context *cxt, unsigned char type);
 extern char read_chars(struct fdisk_context *cxt, char *mesg);
 extern int warn_geometry(struct fdisk_context *cxt);
diff --git a/fdisks/fdiskdoslabel.c b/fdisks/fdiskdoslabel.c
index e44c444236..55b28c2036 100644
--- a/fdisks/fdiskdoslabel.c
+++ b/fdisks/fdiskdoslabel.c
@@ -564,6 +564,24 @@ static sector_t get_unused_start(struct fdisk_context *cxt,
 	return start;
 }
 
+static void fill_bounds(sector_t *first, sector_t *last)
+{
+	int i;
+	struct pte *pe = &ptes[0];
+	struct partition *p;
+
+	for (i = 0; i < partitions; pe++,i++) {
+		p = pe->part_table;
+		if (!p->sys_ind || IS_EXTENDED (p->sys_ind)) {
+			first[i] = 0xffffffff;
+			last[i] = 0;
+		} else {
+			first[i] = get_partition_start(pe);
+			last[i] = first[i] + get_nr_sects(p) - 1;
+		}
+	}
+}
+
 static int add_partition(struct fdisk_context *cxt, int n, struct fdisk_parttype *t)
 {
 	char mesg[256];		/* 48 does not suffice in Japanese */