From: Karel Zak <kzak@redhat.com>
Date: Wed, 12 Jun 2013 15:16:39 +0000 (+0200)
Subject: fdisk: move get_nr_sects() fdisk.h
X-Git-Tag: v2.24-rc1~185
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5497ba0442a78615ae9ada765c5d68d26eae82fc;p=thirdparty%2Futil-linux.git

fdisk: move get_nr_sects() fdisk.h

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

diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index 051198161c..0087c235e4 100644
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -47,10 +47,6 @@
 #endif
 
 
-sector_t get_nr_sects(struct partition *p) {
-	return read4_little_endian(p->size4);
-}
-
 int	nowarn = 0;			/* no warnings for fdisk -l/-s */
 
 void toggle_units(struct fdisk_context *cxt)
diff --git a/fdisks/fdisk.h b/fdisks/fdisk.h
index 7ecfa25698..3f4bbdb788 100644
--- a/fdisks/fdisk.h
+++ b/fdisks/fdisk.h
@@ -86,8 +86,6 @@ extern unsigned int read_int_with_suffix(struct fdisk_context *cxt,
 					 unsigned int low, unsigned int dflt, unsigned int high,
 				  unsigned int base, char *mesg, int *is_suffix_used);
 
-extern sector_t get_nr_sects(struct partition *p);
-
 extern int nowarn;
 
 /* start_sect and nr_sects are stored little endian on all machines */
@@ -107,6 +105,11 @@ static inline unsigned int read4_little_endian(const unsigned char *cp)
 		+ ((unsigned int)(cp[3]) << 24);
 }
 
+static inline sector_t get_nr_sects(struct partition *p)
+{
+	return read4_little_endian(p->size4);
+}
+
 static inline void set_nr_sects(struct partition *p, sector_t nr_sects)
 {
 	store4_little_endian(p->size4, nr_sects);