fdisk: use BSD label header

Move bsd specific function definitions into its own header file and include it in fdisk code.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 938779536c3015e8c0f257da3ad4e3daaa344cc1..b38502769a175c93f8203161df1965c42e7b9985 100644 (file)
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -39,6 +39,7 @@
 #include "fdiskaixlabel.h"
 #include "fdiskmaclabel.h"
 #include "fdiskdoslabel.h"
+#include "fdiskbsdlabel.h"
 
 #ifdef HAVE_LINUX_COMPILER_H
 #include <linux/compiler.h>

diff --git a/fdisk/fdisk.h b/fdisk/fdisk.h
index 0dafbf8acd0487ddd20478f021a7e0b6de018ec5..82888dc5650a369f4fe2cf3b5ba7f05bd5f0f21f 100644 (file)
--- a/fdisk/fdisk.h
+++ b/fdisk/fdisk.h
@@ -185,9 +185,3 @@ static inline int is_cleared_partition(struct partition *p)
                 p->sys_ind || p->end_head || p->end_sector || p->end_cyl ||
                 get_start_sect(p) || get_nr_sects(p));
 }
-
-/* prototypes for fdiskbsdlabel.c */
-extern void bsd_command_prompt(void);
-extern int check_osf_label(void);
-extern int btrydev(char * dev);
-extern void xbsd_print_disklabel(int);

diff --git a/fdisk/fdiskbsdlabel.h b/fdisk/fdiskbsdlabel.h
index e58e2ff4b938b71861688bc2e844e63a4b694222..9bea7cf9b93c84dd7d29ae080264c7f6fe9534c6 100644 (file)
--- a/fdisk/fdiskbsdlabel.h
+++ b/fdisk/fdiskbsdlabel.h
@@ -238,4 +238,9 @@ static struct systypes xbsd_fstypes[] = {
 #define        BSD_D_CHAIN     0x10            /* can do back-back transfers */
 #define        BSD_D_DOSPART   0x20            /* within MSDOS partition */
 
+extern void bsd_command_prompt(void);
+extern int check_osf_label(void);
+extern int btrydev(char * dev);
+extern void xbsd_print_disklabel(int);
+
 #endif /* FDISK_BSD_LABEL_H */