Skip to contentSkip to conversation

fdisk: use BSD label header

PATCH Applied Davidlohr Bueso 1 participant 1 message May 20, 2012 Util-Linux package

lore
Share & tools
lore

Davidlohr Bueso

author
#0 lore raw

PATCH 4/6 fdisk: use BSD label header

From: Davidlohr Bueso <[email protected]>

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

Signed-off-by Davidlohr Bueso <[email protected]>
---
 fdisk/fdisk.c         |    1 +
 fdisk/fdisk.h         |    6 ------
 fdisk/fdiskbsdlabel.h |    5 +++++
 3 files changed, 6 insertions(+), 6 deletions(-)
fdisk/fdisk.c +1 -0
index 08afb45..b6c5758 100644
@@ -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>
fdisk/fdisk.h +0 -6
index 0dafbf8..82888dc 100644
@@ -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);
fdisk/fdiskbsdlabel.h +5 -0
index e58e2ff..9bea7cf 100644
@@ -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 */
Signature · 1 line
1.7.4.1